Merge branch 'Polish' of http://server0:3001/Gremlinsoft/TurnBasedStrategyCourse into Polish

UserSettings/Layouts/default-2023.dwlt

@@ -17,16 +17,10 @@ MonoBehaviour:
     x: 0
     y: 29
     width: 2560
-<<<<<<< HEAD
     height: 1340
-=======
     y: 43
     width: 1920
     height: 989
->>>>>>> 3e7ef22a (2023.2.0a18)
-=======
-    height: 1368
->>>>>>> 230fe5f3 (TargetUnit set after checks)
   m_ShowMode: 4
   m_Title: Inspector
   m_RootView: {fileID: 2}
@@ -54,17 +48,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 2560
-<<<<<<< HEAD
     height: 1340
-=======
-    width: 1920
-    height: 989
->>>>>>> 3e7ef22a (2023.2.0a18)
-=======
-    height: 1368
->>>>>>> 230fe5f3 (TargetUnit set after checks)
-  m_MinSize: {x: 875, y: 300}
-  m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_UseBottomView: 1
@@ -109,13 +93,8 @@ MonoBehaviour:
     x: 0
     y: 1348
     width: 2560
-<<<<<<< HEAD
-=======
     y: 969
     width: 1920
->>>>>>> 3e7ef22a (2023.2.0a18)
-=======
->>>>>>> 230fe5f3 (TargetUnit set after checks)
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -139,15 +118,7 @@ MonoBehaviour:
     x: 0
     y: 30
     width: 2560
-<<<<<<< HEAD
     height: 1290
-=======
-    width: 1920
-    height: 939
->>>>>>> 3e7ef22a (2023.2.0a18)
-=======
-    height: 1318
->>>>>>> 230fe5f3 (TargetUnit set after checks)
   m_MinSize: {x: 300, y: 100}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
@@ -172,15 +143,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 2048
-<<<<<<< HEAD
     height: 1290
-=======
-    width: 1575
-    height: 939
->>>>>>> 3e7ef22a (2023.2.0a18)
-=======
-    height: 1318
->>>>>>> 230fe5f3 (TargetUnit set after checks)
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
@@ -203,15 +166,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 2048
-<<<<<<< HEAD
     height: 861
-=======
-    width: 1575
-    height: 627
->>>>>>> 3e7ef22a (2023.2.0a18)
-=======
-    height: 881
->>>>>>> 230fe5f3 (TargetUnit set after checks)
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 13}
@@ -240,16 +195,7 @@ MonoBehaviour:
     x: 0
     y: 881
     width: 2048
-<<<<<<< HEAD
     height: 429
-=======
-    y: 627
-    width: 1575
-    height: 312
->>>>>>> 3e7ef22a (2023.2.0a18)
-=======
-    height: 437
->>>>>>> 230fe5f3 (TargetUnit set after checks)
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
@@ -275,10 +221,6 @@ MonoBehaviour:
     height: 437
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-<<<<<<< HEAD
->>>>>>> 3e7ef22a (2023.2.0a18)
-=======
->>>>>>> 230fe5f3 (TargetUnit set after checks)
   m_ActualView: {fileID: 14}
   m_Panes:
   - {fileID: 14}
@@ -301,18 +243,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 878
     y: 0
-<<<<<<< HEAD
-<<<<<<< HEAD
     width: 1169
     height: 429
-=======
-    width: 1136
-    height: 312
->>>>>>> 3e7ef22a (2023.2.0a18)
-=======
-    width: 1170
-    height: 437
->>>>>>> 230fe5f3 (TargetUnit set after checks)
   m_MinSize: {x: 102, y: 121}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 16}
@@ -339,15 +271,7 @@ MonoBehaviour:
     x: 2048
     y: 0
     width: 512
-<<<<<<< HEAD
     height: 1290
-=======
-    width: 345
-    height: 939
->>>>>>> 3e7ef22a (2023.2.0a18)
-=======
-    height: 1318
->>>>>>> 230fe5f3 (TargetUnit set after checks)
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 17}
@@ -482,16 +406,7 @@ MonoBehaviour:
     x: 0
     y: 19
     width: 2047
-<<<<<<< HEAD
     height: 840
-=======
-    y: 73
-    width: 1574
-    height: 606
->>>>>>> 3e7ef22a (2023.2.0a18)
-=======
-    height: 860
->>>>>>> 230fe5f3 (TargetUnit set after checks)
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1125,21 +1040,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-<<<<<<< HEAD
-<<<<<<< HEAD
     y: 947
     width: 878
     height: 408
-=======
-    y: 700
-    width: 438
-    height: 291
->>>>>>> 3e7ef22a (2023.2.0a18)
-=======
-    y: 19
-    width: 877
-    height: 416
->>>>>>> 230fe5f3 (TargetUnit set after checks)
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1157,14 +1060,9 @@ MonoBehaviour:
       m_SelectedIDs: 
       m_LastClickedID: 0
       m_ExpandedIDs: 5adfffff
-<<<<<<< HEAD
-=======
       m_SelectedIDs: 36af0000
       m_LastClickedID: 44854
       m_ExpandedIDs: 70dfffff
->>>>>>> 3e7ef22a (2023.2.0a18)
-=======
->>>>>>> 230fe5f3 (TargetUnit set after checks)
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -1366,21 +1264,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 879
-<<<<<<< HEAD
     y: 947
     width: 1167
     height: 408
-=======
-    x: 439
-    y: 700
-    width: 1134
-    height: 291
->>>>>>> 3e7ef22a (2023.2.0a18)
-=======
-    y: 19
-    width: 1168
-    height: 416
->>>>>>> 230fe5f3 (TargetUnit set after checks)
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1417,17 +1303,7 @@ MonoBehaviour:
     x: 2049
     y: 19
     width: 511
-<<<<<<< HEAD
     height: 1269
-=======
-    x: 1575
-    y: 73
-    width: 344
-    height: 918
->>>>>>> 3e7ef22a (2023.2.0a18)
-=======
-    height: 1297
->>>>>>> 230fe5f3 (TargetUnit set after checks)
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0