From 69986d68fda29a930f47ce22310aef2498046f9d Mon Sep 17 00:00:00 2001
From: yi-ge <a@wyr.me>
Date: Mon, 6 Jul 2020 11:47:36 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E5=B0=86=E6=9C=89=E5=BA=8F=E6=95=B0?=
 =?UTF-8?q?=E7=BB=84=E8=BD=AC=E6=8D=A2=E4=B8=BA=E4=BA=8C=E5=8F=89=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/tree/convert-sorted-array-to-binary-search-tree.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/tree/convert-sorted-array-to-binary-search-tree.js b/src/tree/convert-sorted-array-to-binary-search-tree.js
index 7cc141b..af258b4 100644
--- a/src/tree/convert-sorted-array-to-binary-search-tree.js
+++ b/src/tree/convert-sorted-array-to-binary-search-tree.js
@@ -1,15 +1,5 @@
-<<<<<<< HEAD
 import TreeNode from '../../test/tree/TreeNode'
-=======
-/**
- * Definition for a binary tree node.
- */
-function TreeNode(val) {
-  this.val = val
-  this.left = this.right = null
-}
 
->>>>>>> 450f1f6b5d96df43627b7b8c07518b2ec772a2da
 /**
  * @param {number[]} nums
  * @return {TreeNode}