From 707116a39b19e1757bfec75493ec50a84d7e9fd0 Mon Sep 17 00:00:00 2001
From: Riley Testut <riley@rileytestut.com>
Date: Tue, 27 Jun 2023 18:58:41 -0500
Subject: [PATCH] Automatically resolves Cheat + ControllerSkin sync conflicts

---
 Delta/Database/Model/Human/Cheat.swift          | 5 +++++
 Delta/Database/Model/Human/ControllerSkin.swift | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/Delta/Database/Model/Human/Cheat.swift b/Delta/Database/Model/Human/Cheat.swift
index edc63c7..432922b 100644
--- a/Delta/Database/Model/Human/Cheat.swift
+++ b/Delta/Database/Model/Human/Cheat.swift
@@ -53,4 +53,9 @@ extension Cheat: Syncable
     public var syncableLocalizedName: String? {
         return self.name
     }
+    
+    public func resolveConflict(_ record: AnyRecord) -> ConflictResolution
+    {
+        return .newest
+    }
 }
diff --git a/Delta/Database/Model/Human/ControllerSkin.swift b/Delta/Database/Model/Human/ControllerSkin.swift
index ea09c99..3d9c030 100644
--- a/Delta/Database/Model/Human/ControllerSkin.swift
+++ b/Delta/Database/Model/Human/ControllerSkin.swift
@@ -129,4 +129,9 @@ extension ControllerSkin: Syncable
     public var syncableLocalizedName: String? {
         return self.name
     }
+    
+    public func resolveConflict(_ record: AnyRecord) -> ConflictResolution
+    {
+        return .newest
+    }
 }