|
|
@@ -1,4 +1,3 @@
|
|
|
-<<<<<<< HEAD
|
|
|
######################################################################
|
|
|
# Build Tools
|
|
|
yunnan-report-ui_bak/
|
|
|
@@ -46,19 +45,3 @@ nbdist/
|
|
|
!*/build/*.java
|
|
|
!*/build/*.html
|
|
|
!*/build/*.xml
|
|
|
-=======
|
|
|
-# ---> Java
|
|
|
-*.class
|
|
|
-
|
|
|
-# Mobile Tools for Java (J2ME)
|
|
|
-.mtj.tmp/
|
|
|
-
|
|
|
-# Package Files #
|
|
|
-*.jar
|
|
|
-*.war
|
|
|
-*.ear
|
|
|
-
|
|
|
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
|
|
|
-hs_err_pid*
|
|
|
-
|
|
|
->>>>>>> 8e9c5ae0862cdc807ab9d70f21e092d339355413
|
yangkangwei