From 8bcdc353d2bddb9ea0c95ef0fd0a7fe6082615fc Mon Sep 17 00:00:00 2001
From: Michael Scire <SciresM@gmail.com>
Date: Tue, 30 Aug 2016 21:35:26 -0700
Subject: [PATCH] Manually merge master resource file

---
 PKHeX/Properties/Resources.resx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PKHeX/Properties/Resources.resx b/PKHeX/Properties/Resources.resx
index 0d2026914..5cd3b8a57 100644
--- a/PKHeX/Properties/Resources.resx
+++ b/PKHeX/Properties/Resources.resx
@@ -6391,7 +6391,7 @@
   <data name="swapBox" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\box\swapBox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="personal_rby" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\byte\personal_rby;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="ProgramVersion" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\text\version.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
 </root>
\ No newline at end of file