Merge branch 'suyeon' of https://github.com/OMZigak/iOS into suyeon

OMZigak · Jul 8, 2024 · 1f063c2 · 1f063c2
2 parents ae5153d + ba7460e
commit 1f063c2
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/KkuMulKum.xcodeproj/project.pbxproj b/KkuMulKum.xcodeproj/project.pbxproj
@@ -295,6 +295,10 @@
 				78B928792C29402E006D9942 /* Info.plist */,
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+				DE9E187E2C3BA49B00DB76B4 /* Components */,
+>>>>>>> ba7460ef3e4530701723c7cf90b339ab976895fc
 =======
 				DE9E187E2C3BA49B00DB76B4 /* Components */,
 >>>>>>> ba7460ef3e4530701723c7cf90b339ab976895fc