From 273ee3155a01eb09696afa3508e3322058f74b76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BF=86=E6=B5=B716?= <>
Date: Tue, 21 May 2024 15:49:11 +0800
Subject: [PATCH] MusicPlayer.xcdatamodeld

---
 .../MusicPlayer.xcdatamodel/contents                        | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/MusicPlayer/MP/Common/DataBase/MusicPlayer.xcdatamodeld/MusicPlayer.xcdatamodel/contents b/MusicPlayer/MP/Common/DataBase/MusicPlayer.xcdatamodeld/MusicPlayer.xcdatamodel/contents
index 055fdcd..5a00158 100644
--- a/MusicPlayer/MP/Common/DataBase/MusicPlayer.xcdatamodeld/MusicPlayer.xcdatamodel/contents
+++ b/MusicPlayer/MP/Common/DataBase/MusicPlayer.xcdatamodeld/MusicPlayer.xcdatamodel/contents
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<<<<<<< HEAD
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22757" systemVersion="23E214" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
-
 <model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22757" systemVersion="23E224" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
-
     <entity name="MPPositive_CollectionArtistModel" representedClassName="MPPositive_CollectionArtistModel" syncable="YES">
         <attribute name="artistId" optional="YES" attributeType="String"/>
         <attribute name="coverImage" optional="YES" attributeType="URI"/>
@@ -47,4 +43,4 @@
         <attribute name="path" optional="YES" attributeType="String"/>
         <attribute name="title" optional="YES" attributeType="String"/>
     </entity>
-</model>
+</model>
\ No newline at end of file