|
|
@@ -1,4 +1,3 @@
|
|
|
-<<<<<<< HEAD
|
|
|
.DS_Store
|
|
|
node_modules/
|
|
|
dist/
|
|
|
@@ -22,52 +21,3 @@ selenium-debug.log
|
|
|
|
|
|
package-lock.json
|
|
|
yarn.lock
|
|
|
-
|
|
|
-=======
|
|
|
-######################################################################
|
|
|
-# Build Tools
|
|
|
-
|
|
|
-.gradle
|
|
|
-/build/
|
|
|
-!gradle/wrapper/gradle-wrapper.jar
|
|
|
-
|
|
|
-target/
|
|
|
-!.mvn/wrapper/maven-wrapper.jar
|
|
|
-
|
|
|
-######################################################################
|
|
|
-# IDE
|
|
|
-
|
|
|
-### STS ###
|
|
|
-.apt_generated
|
|
|
-.classpath
|
|
|
-.factorypath
|
|
|
-.project
|
|
|
-.settings
|
|
|
-.springBeans
|
|
|
-
|
|
|
-### IntelliJ IDEA ###
|
|
|
-.idea
|
|
|
-*.iws
|
|
|
-*.iml
|
|
|
-*.ipr
|
|
|
-
|
|
|
-### JRebel ###
|
|
|
-rebel.xml
|
|
|
-### NetBeans ###
|
|
|
-nbproject/private/
|
|
|
-build/*
|
|
|
-nbbuild/
|
|
|
-dist/
|
|
|
-nbdist/
|
|
|
-.nb-gradle/
|
|
|
-
|
|
|
-######################################################################
|
|
|
-# Others
|
|
|
-*.log
|
|
|
-*.xml.versionsBackup
|
|
|
-*.swp
|
|
|
-
|
|
|
-!*/build/*.java
|
|
|
-!*/build/*.html
|
|
|
-!*/build/*.xml
|
|
|
->>>>>>> c766285717e56ebab0499b97c88a94fc3c86271c
|
