fix/#154 충돌 해결

OMZigak · Jul 11, 2024 · 3641c3c · 3641c3c
1 parent 121f927
commit 3641c3c
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 11 deletions.
diff --git a/KkuMulKum/Resource/Assets.xcassets/Image/img_profile.imageset/Contents.json b/KkuMulKum/Resource/Assets.xcassets/Image/img_profile.imageset/Contents.json
@@ -1,16 +1,8 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "Mask group.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {

diff --git a/KkuMulKum/Resource/Assets.xcassets/Image/img_profile.imageset/ic_profilebasic.png b/KkuMulKum/Resource/Assets.xcassets/Image/img_profile.imageset/ic_profilebasic.png
diff --git a/...lKum/Resource/Assets.xcassets/Image/img_profile.imageset/[email protected] b/...lKum/Resource/Assets.xcassets/Image/img_profile.imageset/[email protected]
diff --git a/...lKum/Resource/Assets.xcassets/Image/img_profile.imageset/[email protected] b/...lKum/Resource/Assets.xcassets/Image/img_profile.imageset/[email protected]
diff --git a/KkuMulKum/Resource/Assets.xcassets/Image/img_profile.imageset/my_btn_edit.png b/KkuMulKum/Resource/Assets.xcassets/Image/img_profile.imageset/my_btn_edit.png
diff --git a/KkuMulKum/Source/MyPage/View/MyPageContentView.swift b/KkuMulKum/Source/MyPage/View/MyPageContentView.swift
@@ -45,7 +45,7 @@ class MyPageContentView: BaseView {
 
     override func setupView() {
         backgroundColor = .clear
-        addSubview(profileStackView,levelView,separatorView)
+        addSubviews(profileStackView,levelView,separatorView)
         profileStackView.addArrangedSubviews(profileImageView, nameLabel)
         levelView.addSubview(levelLabel)
     }