Fixed unnecesary merge conflict additions

Author: jheysel-r7

lib/msf/core/exploit/remote/ldap/active_directory/security_descriptor_matcher.rb

@@ -119,17 +119,17 @@ def self.full_control
 
         def self.certificate_autoenrollment
           MultipleAny.new([
-                            Allow.new(:CR, object_id: CERTIFICATE_AUTOENROLLMENT_EXTENDED_RIGHT),
-                            full_control
-                          ])
+            Allow.new(:CR, object_id: CERTIFICATE_AUTOENROLLMENT_EXTENDED_RIGHT),
+            full_control
+          ])
         end
 
         # Build a matcher that will check for a certificate's enrollment permission.
         def self.certificate_enrollment
           MultipleAny.new([
-                            Allow.new(:CR, object_id: CERTIFICATE_ENROLLMENT_EXTENDED_RIGHT),
-                            full_control
-                          ])
+            Allow.new(:CR, object_id: CERTIFICATE_ENROLLMENT_EXTENDED_RIGHT),
+            full_control
+          ])
         end
       end
 
@@ -176,4 +176,4 @@ def matches?
       end
     end
   end
-end
+end

spec/lib/msf/core/exploit/remote/ldap/active_directory/security_descriptor_matcher_spec.rb

@@ -160,4 +160,4 @@
       expect(matcher.satisfied?).to be_falsey
     end
   end
-end
+end