# Conflicts: # Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab # Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua |
||
---|---|---|
.. | ||
ItemView.prefab | ||
ItemView.prefab.meta | ||
ItemViewOld.prefab | ||
ItemViewOld.prefab.meta |
# Conflicts: # Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab # Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua |
||
---|---|---|
.. | ||
ItemView.prefab | ||
ItemView.prefab.meta | ||
ItemViewOld.prefab | ||
ItemViewOld.prefab.meta |