1 files changed, 9 insertions, 0 deletions
diff --git a/source/WindowsFormsApplication1/Properties/Resources.Designer.cs b/source/WindowsFormsApplication1/Properties/Resources.Designer.cs
index ae839f0..35fd7f9 100644
--- a/source/WindowsFormsApplication1/Properties/Resources.Designer.cs
+++ b/source/WindowsFormsApplication1/Properties/Resources.Designer.cs
@@ -10,6 +10,7 @@
 
 namespace ShiftOS.Properties {
     using System;
+    using System.Reflection;
     
     
     /// <summary>
@@ -376,8 +377,12 @@ namespace ShiftOS.Properties {
         ///	&quot;You may realize that ShiftOS is quite locked down. This is to prevent anything bad from happening.&quot;:&quot;???&quot;,
         ///	&quot;However, in your Terminal, you should be able to run &apos;quests&apos; to view all the tasks we need to accomplish.&quot;:&quot;???&quot;,
         ///	&quot;You&apos;ll also see a window near the App Launcher, I will use it to talk to you as we do things.&quot;:&quot;???&quot;,
+<<<<<<< HEAD
         ///	&quot;Well. Let&apos;s get started.&quot;:&quot;???&quot;
         /// [rest of string was truncated]&quot;;.
+=======
+        ///	&quot;Well. Let&apos;s get started.&quot;:&quot;???&quot;
+        /// [rest of string was truncated]&quot;;.
+>>>>>>> b7ae3515fb5346a5050356f484cabd2c3b751ec7
         /// </summary>
         public static string Choice2 {
             get {
@@ -503,7 +508,11 @@ namespace ShiftOS.Properties {
         ///
         ///All music in ShiftOS is provided by Free Songs to Use, whose YouTube channel ca [rest of string was truncated]&quot;;.
         /// </summary>
+<<<<<<< HEAD
         public static string Credits {
+=======
+        internal static string Credits {
+>>>>>>> b7ae3515fb5346a5050356f484cabd2c3b751ec7
             get {
                 return ResourceManager.GetString("Credits", resourceCulture);
             }