t

.gitignore

@@ -7,4 +7,9 @@ extend
 *.log
 */src/src
 *.data
-*/bin
+*/bin
+.idea/*
+.gitignore
+.gitignore.bak
+src/jfw/modules/entsesearch/.idea/*
+src/jfw/modules/followent/.idea/*

.idea/misc.xml

@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-<<<<<<< HEAD
-  <component name="GOROOT" path="/usr/local/go" />
-=======
   <component name="GOROOT" path="C:/go" />
->>>>>>> b673ea6b82d098a5040ba1bd5d56ac194a55394d
 </project>