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