Merge branch 'master' of https://github.com/mattv8/service-desk

ltb-project · Sep 19, 2022 · 71cae52 · 71cae52
2 parents 9280f86 + d069b5a
commit 71cae52
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/htdocs/editattribute.php b/htdocs/editattribute.php
@@ -29,7 +29,12 @@
  $errno = ldap_errno($ldap);
 
  if ( $errno != 0 ) {// If there's an ldap error, stop here.
+ $result = "Cannot modify attribute (".ldap_error($ldap).")";
+<<<<<<< HEAD
  $result = "Error: cannot modify attribute (".ldap_error($ldap).")";
+=======
+ $result = "Cannot modify attribute (".ldap_error($ldap).")";
+>>>>>>> d069b5a0f5dae55f33e4034b420218a7158f2a0d
  } else {
  $result = "successfuledit";
  }