From 4887224e45d4b70aa044e84a9b01b15a0360f691 Mon Sep 17 00:00:00 2001
From: coderaiser <coderaiser@cloudcmd.io>
Date: Thu, 23 Aug 2018 18:43:13 +0300
Subject: [PATCH] chore(dom) rm unused

---
 client/dom/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/dom/index.js b/client/dom/index.js
index 22d82a3c..8db8e9cf 100644
--- a/client/dom/index.js
+++ b/client/dom/index.js
@@ -135,7 +135,6 @@ function CmdProto() {
     }
     
     /**
-<<<<<<< HEAD
      * get current direcotory name
      */
     this.getCurrentDirName = () => {