From b8876aa3979e5f659c48c10bc33c12141f4b20e8 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Fri, 16 Apr 2021 10:15:00 +0800
Subject: [PATCH] 1

---
 server/gameserver/player.cc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 1207a517..2701662d 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -129,15 +129,11 @@ void Player::InternalUpdate(int delta_time)
         if (has_use_item_id) {
             UpdateUseItemId();
         }
-<<<<<<< HEAD
         UpdateViewObjects();
-      }
-=======
         if (playing_skill) {
             UpdateSkill();
         }
     }
->>>>>>> dev
 }
 
 void Player::UpdateMove()