Remove notices

2026-06-05 15:09:37 +09:00 · 2016-01-04 11:09:41 +08:00
parent 52ee46b997
commit 6e7d1aef62
1 changed files with 1 additions and 3 deletions
@@ -1209,12 +1209,10 @@ function um_user( $data, $attrs = null ) {
 		case 'display_name':
 			
 			$op = um_get_option('display_name');
-<<<<<<< HEAD
+
 			$name = '';
 			
-=======

->>>>>>> 8a95eda1ec440cbf18dff26b709c5f163d0c83f9
 			if ( $op == 'default' ) {
 				$name = um_profile('display_name');
 			}