处理冲突问题

galaxy/galaxy/Classes/Modules/Login(登录)/V/YHLoginPrivacyView.swift

@@ -32,13 +32,9 @@ class YHLoginPrivacyView: UIView {
     func setView() {
         agreeButton = {
             let button = UIButton(type: .custom)
-<<<<<<< HEAD
             button.setBackgroundImage(UIImage(named: "login_privacy_disagree_glay"), for: .normal)
-            button.setBackgroundImage(UIImage(named: "login_privacy_agree"), for: .selected)
-=======
-            button.setBackgroundImage(UIImage(named: "login_privacy_disagree_white"), for: .normal)
             button.setBackgroundImage(UIImage(named: "login_privacy_agree_white"), for: .selected)
->>>>>>> main
+
             button.addTarget(self, action: #selector(agreeClick), for: .touchUpInside)
             return button
         }()