1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
| <<<<<<< HEAD
| ######################################################################
| # 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
| =======
| .DS_Store
| node_modules/
| dist/
| npm-debug.log*
| yarn-debug.log*
| yarn-error.log*
| **/*.log
|
| tests/**/coverage/
| tests/e2e/reports
| selenium-debug.log
|
| # Editor directories and files
| .idea
| .vscode
| *.suo
| *.ntvs*
| *.njsproj
| *.sln
| *.local
|
| package-lock.json
| yarn.lock
| >>>>>>> 802423e8 (3.30)
|
|
