From 6e7d1aef62d2827ade11aaf22afc8ad4be3211bc Mon Sep 17 00:00:00 2001
From: champsupertramp <heychampsupertramp@gmail.com>
Date: Mon, 4 Jan 2016 11:09:41 +0800
Subject: [PATCH] Remove notices

---
 core/um-short-functions.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/um-short-functions.php b/core/um-short-functions.php
index 0bd35a77..cef51327 100644
--- a/core/um-short-functions.php
+++ b/core/um-short-functions.php
@@ -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');
 			}