fix rebase issue

Author: pcen

C7/C7Game.tscn

@@ -94,6 +94,7 @@ script = ExtResource("9")
 
 [node name="Control" type="Control" parent="CanvasLayer"]
 layout_mode = 3
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 offset_left = 10.0
@@ -181,12 +182,14 @@ text = "End Turn"
 
 [node name="SlideOutBar" type="Control" parent="CanvasLayer/Control"]
 layout_mode = 1
+anchors_preset = 11
 anchor_left = 1.0
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_top = 50.0
-offset_right = -10.0
-offset_bottom = -200.0
+offset_left = -108.0
+offset_top = 80.0
+offset_right = -108.0
+offset_bottom = -170.0
 grow_horizontal = 0
 grow_vertical = 2
 mouse_filter = 1
@@ -247,14 +250,10 @@ libraries = {
 "": SubResource("AnimationLibrary_bowxq")
 }
 
-[node name="PlayerCamera" type="Camera2D" parent="CanvasLayer"]
-script = ExtResource("11_pkhac")
-
 [connection signal="NewAutoselectedUnit" from="." to="CanvasLayer/Control/GameStatus" method="OnNewUnitSelected"]
 [connection signal="NewAutoselectedUnit" from="." to="CanvasLayer/Control/UnitButtons" method="OnNewUnitSelected"]
 [connection signal="NoMoreAutoselectableUnits" from="." to="CanvasLayer/Control/GameStatus" method="OnNoMoreAutoselectableUnits"]
 [connection signal="NoMoreAutoselectableUnits" from="." to="CanvasLayer/Control/UnitButtons" method="OnNoMoreAutoselectableUnits"]
-
 [connection signal="ShowSpecificAdvisor" from="." to="CanvasLayer/Advisor" method="OnShowSpecificAdvisor"]
 [connection signal="TurnEnded" from="." to="CanvasLayer/Control/GameStatus" method="OnTurnEnded"]
 [connection signal="TurnStarted" from="." to="CanvasLayer/Control/GameStatus" method="OnTurnStarted"]

C7/Game.cs

@@ -92,7 +92,7 @@ public override void _Ready() {
 
 			AddChild(mapView);
 
-			Toolbar = GetNode<Control>("CanvasLayer/ToolBar/MarginContainer/HBoxContainer");
+			Toolbar = GetNode<Control>("CanvasLayer/Control/ToolBar/MarginContainer/HBoxContainer");
 
 			//TODO: What was this supposed to do?  It throws errors and occasinally causes crashes now, because _OnViewportSizeChanged doesn't exist
 			// GetTree().Root.Connect("size_changed",new Callable(this,"_OnViewportSizeChanged"));