fix merge problems

ZarestiaDev · Mar 16, 2024 · 039b03e · 039b03e
1 parent d5d6f74
commit 039b03e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 150 deletions.
diff --git a/campaign/template_char.xml b/campaign/template_char.xml
@@ -15,7 +15,7 @@
 			<invisible />
 			<script>
 				function onValueChanged()
-				window.actioninfo.setActionInfo();
+					window.actioninfo.setActionInfo();
 				end
 			</script>
 		</stringfield>
@@ -30,7 +30,7 @@
 			<invisible />
 			<script>
 				function onValueChanged()
-				window.actioninfo.setActionInfo();
+					window.actioninfo.setActionInfo();
 				end
 			</script>
 		</buttonfield>
@@ -45,7 +45,7 @@
 			<invisible />
 			<script>
 				function onValueChanged()
-				window.additionalinfo.StateChanged();
+					window.additionalinfo.StateChanged();
 				end
 			</script>
 		</stringfield>

diff --git a/scripts/sai_manager_power.lua b/scripts/sai_manager_power.lua