Avoid Merge Conflict

sunhofficial · sunhofficial · commit 60dc434ce5bc · 2023-02-01T14:19:57.000+09:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+*.pbxproj binary merge=union
diff --git a/LGHTSG/LGHTSG.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/LGHTSG/LGHTSG.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
