From ca9d46fea66dd3a0878fb11469156ab1c57c0fb0 Mon Sep 17 00:00:00 2001
From: Alex-TIMEHACK <alexbu2015@hotmail.com>
Date: Sat, 20 May 2017 09:44:06 +0100
Subject: Fixed Conflicts PART 2

---
 TimeHACK.Main/Properties/Resources.resx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'TimeHACK.Main/Properties')

diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx
index 8eaea12..0c76722 100644
--- a/TimeHACK.Main/Properties/Resources.resx
+++ b/TimeHACK.Main/Properties/Resources.resx
@@ -350,6 +350,7 @@
   </data>
   <data name="WinClassicGENERALApplicationToolbarBackground" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\WinClassic\WinClassicGENERALApplicationToolbarBackground.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="WinClassicTaskbarItem" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\winclassic\winclassictaskbaritem.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-- 
cgit v1.2.3