From c1a1b8b5dc65f2ca101fb9f797934ab13650008a Mon Sep 17 00:00:00 2001
From: fangdong sun <fangdong sun>
Date: Thu, 11 Aug 2016 10:48:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=88=86=E6=94=AF=E6=B5=8B=E8=AF=95--?=
 =?UTF-8?q?00?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_form/build.gradle | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/designer_form/build.gradle b/designer_form/build.gradle
index a39f9589e..9932a8085 100644
--- a/designer_form/build.gradle
+++ b/designer_form/build.gradle
@@ -31,15 +31,11 @@ def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
 buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\'))
 def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
 
-<<<<<<< HEAD
+
 FileTree jars=fileTree(dir:'../../../').include "finereport-*-stable/${branchName}/**/*.jar"
 jars.each{File file->
 println "-----------this jar path is ${file.path}----------"
 }
-
-
-=======
->>>>>>> adaabb5817789ef492696721df369702adeb9971
 //ÉùÃ÷ÍⲿÒÀÀµ
 dependencies{
 compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar')