From ca45ae1bda9711a4ad24e143ce190cc2ca948b3e Mon Sep 17 00:00:00 2001
From: william341 <wwokwilliam@gmail.com>
Date: Sun, 8 Jan 2017 15:03:34 -0700
Subject: [PATCH] Revert "Moved Leigion into its own file"

---
 ShiftOS.Objects/Legion.cs  | 38 --------------------------------------
 ShiftOS.Objects/Objects.cs | 30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 38 deletions(-)
 delete mode 100644 ShiftOS.Objects/Legion.cs

diff --git a/ShiftOS.Objects/Legion.cs b/ShiftOS.Objects/Legion.cs
deleted file mode 100644
index 078064f..0000000
--- a/ShiftOS.Objects/Legion.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-namespace ShiftOS.Objects
-{
-public enum LegionRole
-  {
-      Admin,
-      Manager,
-      Committed,
-      Trainee,
-      AwaitingInvite
-  }
-
-  public enum LegionPublicity
-  {
-      Public, //Will display on the 'Join Legion' page, anyone can join
-      PublicInviteOnly, //Will display on the 'Join Legion' page but you must be invited
-      Unlisted, //Won't display on 'Join Legion', but anyone can join
-      UnlistedInviteOnly //Won't display in 'Join Legion', and admin/manager invitation is required.
-  }
-
-  public class Legion
-  {
-      public string Name { get; set; }
-      public LegionPublicity Publicity { get; set; }
-      public ConsoleColor BannerColor { get; set; }
-      public string Description { get; set; }
-      public string ShortName { get; set; }
-
-      public Dictionary<string, LegionRole> Roles { get; set; }
-      public Dictionary<LegionRole, string> RoleNames { get; set; }
-
-
-  }
-}
diff --git a/ShiftOS.Objects/Objects.cs b/ShiftOS.Objects/Objects.cs
index 2aafbd9..4c1abcc 100644
--- a/ShiftOS.Objects/Objects.cs
+++ b/ShiftOS.Objects/Objects.cs
@@ -30,6 +30,36 @@ using System.Threading.Tasks;
 
 namespace ShiftOS.Objects
 {
+    public enum LegionRole
+    {
+        Admin,
+        Manager,
+        Committed,
+        Trainee,
+        AwaitingInvite
+    }
+
+    public enum LegionPublicity
+    {
+        Public, //Will display on the 'Join Legion' page, anyone can join
+        PublicInviteOnly, //Will display on the 'Join Legion' page but you must be invited
+        Unlisted, //Won't display on 'Join Legion', but anyone can join
+        UnlistedInviteOnly //Won't display in 'Join Legion', and admin/manager invitation is required.
+    }
+
+    public class Legion
+    {
+        public string Name { get; set; }
+        public LegionPublicity Publicity { get; set; }
+        public ConsoleColor BannerColor { get; set; }
+        public string Description { get; set; }
+        public string ShortName { get; set; }
+
+        public Dictionary<string, LegionRole> Roles { get; set; }
+        public Dictionary<LegionRole, string> RoleNames { get; set; }
+
+        
+    }
 
     public class MUDMemo
     {