fix merge conflicts

24 files changed, 0 insertions, 0 deletions

diff --git a/graphics/battle_interface/ball_display.png b/graphics/battle_interface/ball_display.png
index 0c49d7ac4..0c49d7ac4 100755..100644
--- a/graphics/battle_interface/ball_display.png
+++ b/graphics/battle_interface/ball_display.png
diff --git a/graphics/battle_interface/ball_display_unused_extra.png b/graphics/battle_interface/ball_display_unused_extra.png
index 5473d53df..5473d53df 100755..100644
--- a/graphics/battle_interface/ball_display_unused_extra.png
+++ b/graphics/battle_interface/ball_display_unused_extra.png
diff --git a/graphics/battle_interface/bar.png b/graphics/battle_interface/bar.png
index b947a7803..b947a7803 100755..100644
--- a/graphics/battle_interface/bar.png
+++ b/graphics/battle_interface/bar.png
diff --git a/graphics/battle_interface/enemy_mon_shadow.png b/graphics/battle_interface/enemy_mon_shadow.png
index 3db333a92..3db333a92 100755..100644
--- a/graphics/battle_interface/enemy_mon_shadow.png
+++ b/graphics/battle_interface/enemy_mon_shadow.png
diff --git a/graphics/battle_interface/expbar.png b/graphics/battle_interface/expbar.png
index b54dbe600..b54dbe600 100755..100644
--- a/graphics/battle_interface/expbar.png
+++ b/graphics/battle_interface/expbar.png
diff --git a/graphics/battle_interface/hpbar.pal b/graphics/battle_interface/hpbar.pal
index ea646bb82..ea646bb82 100755..100644
--- a/graphics/battle_interface/hpbar.pal
+++ b/graphics/battle_interface/hpbar.pal
diff --git a/graphics/battle_interface/hpbar.png b/graphics/battle_interface/hpbar.png
index f3a0314e4..f3a0314e4 100755..100644
--- a/graphics/battle_interface/hpbar.png
+++ b/graphics/battle_interface/hpbar.png
diff --git a/graphics/battle_interface/hpbar_anim.png b/graphics/battle_interface/hpbar_anim.png
index 9e7564234..9e7564234 100755..100644
--- a/graphics/battle_interface/hpbar_anim.png
+++ b/graphics/battle_interface/hpbar_anim.png
diff --git a/graphics/battle_interface/misc.png b/graphics/battle_interface/misc.png
index 6456ebe5c..6456ebe5c 100755..100644
--- a/graphics/battle_interface/misc.png
+++ b/graphics/battle_interface/misc.png
diff --git a/graphics/battle_interface/misc_frameend.png b/graphics/battle_interface/misc_frameend.png
index 630f44242..630f44242 100755..100644
--- a/graphics/battle_interface/misc_frameend.png
+++ b/graphics/battle_interface/misc_frameend.png
diff --git a/graphics/battle_interface/status2.png b/graphics/battle_interface/status2.png
index 97a344ae3..97a344ae3 100755..100644
--- a/graphics/battle_interface/status2.png
+++ b/graphics/battle_interface/status2.png
diff --git a/graphics/battle_interface/status3.png b/graphics/battle_interface/status3.png
index 3e5989d05..3e5989d05 100755..100644
--- a/graphics/battle_interface/status3.png
+++ b/graphics/battle_interface/status3.png
diff --git a/graphics/battle_interface/status4.png b/graphics/battle_interface/status4.png
index d9769ad28..d9769ad28 100755..100644
--- a/graphics/battle_interface/status4.png
+++ b/graphics/battle_interface/status4.png
diff --git a/graphics/battle_interface/status_brn.png b/graphics/battle_interface/status_brn.png
index 0de1e3ad2..0de1e3ad2 100755..100644
--- a/graphics/battle_interface/status_brn.png
+++ b/graphics/battle_interface/status_brn.png
diff --git a/graphics/battle_interface/status_frz.png b/graphics/battle_interface/status_frz.png
index 3e1d534b5..3e1d534b5 100755..100644
--- a/graphics/battle_interface/status_frz.png
+++ b/graphics/battle_interface/status_frz.png
diff --git a/graphics/battle_interface/status_par.png b/graphics/battle_interface/status_par.png
index 177d4eb5b..177d4eb5b 100755..100644
--- a/graphics/battle_interface/status_par.png
+++ b/graphics/battle_interface/status_par.png
diff --git a/graphics/battle_interface/status_psn.png b/graphics/battle_interface/status_psn.png
index 95869e572..95869e572 100755..100644
--- a/graphics/battle_interface/status_psn.png
+++ b/graphics/battle_interface/status_psn.png
diff --git a/graphics/battle_interface/status_slp.png b/graphics/battle_interface/status_slp.png
index b0eb5a250..b0eb5a250 100755..100644
--- a/graphics/battle_interface/status_slp.png
+++ b/graphics/battle_interface/status_slp.png
diff --git a/graphics/battle_interface/window.pal b/graphics/battle_interface/window.pal
index bc8e8f2bc..bc8e8f2bc 100755..100644
--- a/graphics/battle_interface/window.pal
+++ b/graphics/battle_interface/window.pal
diff --git a/graphics/battle_interface/window.png b/graphics/battle_interface/window.png
index 2117967ec..2117967ec 100755..100644
--- a/graphics/battle_interface/window.png
+++ b/graphics/battle_interface/window.png
diff --git a/graphics/battle_interface/window2.png b/graphics/battle_interface/window2.png
index ac084b2e5..ac084b2e5 100755..100644
--- a/graphics/battle_interface/window2.png
+++ b/graphics/battle_interface/window2.png
diff --git a/graphics/battle_interface/window3.png b/graphics/battle_interface/window3.png
index f45e2f714..f45e2f714 100755..100644
--- a/graphics/battle_interface/window3.png
+++ b/graphics/battle_interface/window3.png
diff --git a/graphics/battle_interface/window4.png b/graphics/battle_interface/window4.png
index a366186cf..a366186cf 100755..100644
--- a/graphics/battle_interface/window4.png
+++ b/graphics/battle_interface/window4.png
diff --git a/graphics/battle_interface/window5.png b/graphics/battle_interface/window5.png
index e48f380a4..e48f380a4 100755..100644
--- a/graphics/battle_interface/window5.png
+++ b/graphics/battle_interface/window5.png