Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/suyeon'
Browse files Browse the repository at this point in the history
Conflicts:
	KkuMulKum.xcodeproj/project.pbxproj
	KkuMulKum/Source/MyPage/ViewController/MyPageViewController.swift
  • Loading branch information
hooni0918 committed Aug 23, 2024
2 parents 0a8fb2d + f44ac8a commit a7ef9ba
Showing 1 changed file with 1 addition and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -148,4 +148,5 @@ class MyPageViewController: BaseViewController, CustomActionSheetDelegate {
actionSheet.delegate = self
present(actionSheet, animated: true, completion: nil)
}

}

0 comments on commit a7ef9ba

Please sign in to comment.