Clean up code merge markers

Signed-off-by: Jake Nabasny <jake@nabasny.com>
nextcloud · Feb 5, 2024 · 7d0eef4 · 7d0eef4
1 parent 1a6ea57
commit 7d0eef4
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 24 deletions.
diff --git a/apps/user_ldap/lib/Configuration.php b/apps/user_ldap/lib/Configuration.php
@@ -134,12 +134,9 @@ class Configuration {
 		'ldapAttributeRole' => null,
 		'ldapAttributeHeadline' => null,
 		'ldapAttributeBiography' => null,
-<<<<<<< HEAD
 		'ldapAdminGroup' => '',
-=======
 		'ldapAttributeBirthDate' => null,
 		'ldapAttributeAnniversaryDate' => null,
->>>>>>> 06dd76fd26 (Add additional user profile attributes from LDAP)
 	];
 
 	public function __construct(string $configPrefix, bool $autoRead = true) {
@@ -496,18 +493,9 @@ public function getDefaults(): array {
 			'ldap_attr_role' => '',
 			'ldap_attr_headline' => '',
 			'ldap_attr_biography' => '',
-<<<<<<< HEAD
-<<<<<<< HEAD
 			'ldap_admin_group' => '',
-=======
 			'ldap_attr_birthdate' => '',
 			'ldap_attr_anniversarydate' => '',
->>>>>>> 06dd76fd26 (Add additional user profile attributes from LDAP)
-=======
-			'ldap_attr_birthdate' => '',
-			'ldap_attr_anniversarydate' => '',
-			'ldap_admin_group' => '',
->>>>>>> 7eaa573bac (resolve other conflicts)
 		];
 	}
 
@@ -584,18 +572,9 @@ public function getConfigTranslationArray(): array {
 			'ldap_attr_role' => 'ldapAttributeRole',
 			'ldap_attr_headline' => 'ldapAttributeHeadline',
 			'ldap_attr_biography' => 'ldapAttributeBiography',
-<<<<<<< HEAD
-<<<<<<< HEAD
 			'ldap_admin_group' => 'ldapAdminGroup',
-=======
 			'ldap_attr_birthdate' => 'ldapAttributeBirthDate',
 			'ldap_attr_anniversarydate' => 'ldapAttributeAnniversaryDate',
->>>>>>> 06dd76fd26 (Add additional user profile attributes from LDAP)
-=======
-			'ldap_attr_birthdate' => 'ldapAttributeBirthDate',
-			'ldap_attr_anniversarydate' => 'ldapAttributeAnniversaryDate',
-			'ldap_admin_group' => 'ldapAdminGroup',
->>>>>>> 7eaa573bac (resolve other conflicts)
 		];
 		return $array;
 	}

diff --git a/apps/user_ldap/lib/Connection.php b/apps/user_ldap/lib/Connection.php
@@ -83,12 +83,9 @@
  * @property string ldapAttributeRole
  * @property string ldapAttributeHeadline
  * @property string ldapAttributeBiography
-<<<<<<< HEAD
  * @property string ldapAdminGroup
-=======
  * @property string ldapAttributeBirthDate
  * @property string ldapAttributeAnniversaryDate
->>>>>>> 06dd76fd26 (Add additional user profile attributes from LDAP)
  */
 class Connection extends LDAPUtility {
 	/**