From 1e350e136945e09cccdf03a7819e4cb051412565 Mon Sep 17 00:00:00 2001
From: Riley Testut <riley@rileytestut.com>
Date: Thu, 19 Sep 2019 13:29:51 -0700
Subject: [PATCH] Automatically resolves GameCollection +
 GameControllerInputMapping conflicts

---
 Delta/Database/Model/Human/GameCollection.swift             | 5 +++++
 Delta/Database/Model/Human/GameControllerInputMapping.swift | 5 +++++
 External/Harmony                                            | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Delta/Database/Model/Human/GameCollection.swift b/Delta/Database/Model/Human/GameCollection.swift
index ea4c38e..631de1e 100644
--- a/Delta/Database/Model/Human/GameCollection.swift
+++ b/Delta/Database/Model/Human/GameCollection.swift
@@ -43,4 +43,9 @@ extension GameCollection: Syncable
     public var syncableLocalizedName: String? {
         return self.name
     }
+    
+    public func resolveConflict(_ record: AnyRecord) -> ConflictResolution
+    {
+        return .newest
+    }
 }
diff --git a/Delta/Database/Model/Human/GameControllerInputMapping.swift b/Delta/Database/Model/Human/GameControllerInputMapping.swift
index 530204c..184fb59 100644
--- a/Delta/Database/Model/Human/GameControllerInputMapping.swift
+++ b/Delta/Database/Model/Human/GameControllerInputMapping.swift
@@ -100,4 +100,9 @@ extension GameControllerInputMapping: Syncable
     public var syncableLocalizedName: String? {
         return self.name
     }
+    
+    public func resolveConflict(_ record: AnyRecord) -> ConflictResolution
+    {
+        return .newest
+    }
 }
diff --git a/External/Harmony b/External/Harmony
index 7f365fa..4d7ba40 160000
--- a/External/Harmony
+++ b/External/Harmony
@@ -1 +1 @@
-Subproject commit 7f365faac01e3a2d562d747875fbd062be4acb5e
+Subproject commit 4d7ba40073c8fed53fa92f7db07d75b4b8929a41