Update JobSpriteController.cs

Don't know why it was there
Xeni91 · Aug 20, 2016 · 724c7c8 · 724c7c8
1 parent 56245b8
commit 724c7c8
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/Assets/Scripts/Controllers/JobSpriteController.cs b/Assets/Scripts/Controllers/JobSpriteController.cs
@@ -16,10 +16,7 @@ void Start()
     {
         jobGameObjectMap = new Dictionary<Job, GameObject>();
         fsc = GameObject.FindObjectOfType<FurnitureSpriteController>();
-<<<<<<< HEAD
 
-=======
->>>>>>> FuelingSystem
         WorldController.Instance.world.jobQueue.cbJobCreated += OnJobCreated;
     }