From 2ec7d1d2f18748d076e9b744c12106739ea21e30 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Thu, 21 Jan 2016 16:17:05 -0500
Subject: [PATCH] Use the main queue for the managed object context as a hack
 to prevent merge conflicts

---
 Limelight/Database/DataManager.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Limelight/Database/DataManager.m b/Limelight/Database/DataManager.m
index 5fa1648..18ade1a 100644
--- a/Limelight/Database/DataManager.m
+++ b/Limelight/Database/DataManager.m
@@ -20,7 +20,7 @@
     self = [super init];
     
     _appDelegate = [[UIApplication sharedApplication] delegate];
-    _managedObjectContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
+    _managedObjectContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSMainQueueConcurrencyType];
     [_managedObjectContext setPersistentStoreCoordinator:_appDelegate.persistentStoreCoordinator];
     
     return self;