Switch to unified view

a b/shared-models/.gitignore
1
#Java
2
*.class
3
4
# Package Files #
5
*.jar
6
*.war
7
*.ear
8
9
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
10
hs_err_pid*
11
12
# Eclipse
13
.classpath
14
.project
15
.settings 
16
.metadata
17
bin/**
18
tmp/**
19
tmp/**/*
20
*.tmp
21
*.bak
22
*.swp
23
*~.nib
24
local.properties 
25
.settings/
26
.loadpath
27
28
#Maven
29
target/
30
pom.xml.tag
31
pom.xml.releaseBackup
32
pom.xml.versionsBackup
33
pom.xml.next
34
release.properties
35
36
/target/
37
/target/
38
39
# show git log script
40
showGitLog.sh
41
42
<<<<<<< HEAD
43
### Intellij ###
44
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
45
=======
46
#IntelliJ
47
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
48
>>>>>>> 9e1b93afd182b687deb9dbb98efc01bb01e3cb29
49
50
*.iml
51
52
## Directory-based project format:
53
.idea/
54
# if you remove the above rule, at least ignore the following:
55
56
# User-specific stuff:
57
# .idea/workspace.xml
58
# .idea/tasks.xml
59
# .idea/dictionaries
60
<<<<<<< HEAD
61
# .idea/shelf
62
=======
63
>>>>>>> 9e1b93afd182b687deb9dbb98efc01bb01e3cb29
64
65
# Sensitive or high-churn files:
66
# .idea/dataSources.ids
67
# .idea/dataSources.xml
68
# .idea/sqlDataSources.xml
69
# .idea/dynamic.xml
70
# .idea/uiDesigner.xml
71
72
# Gradle:
73
# .idea/gradle.xml
74
# .idea/libraries
75
76
# Mongo Explorer plugin:
77
# .idea/mongoSettings.xml
78
79
## File-based project format:
80
*.ipr
81
*.iws
82
<<<<<<< HEAD
83
84
## Plugin-specific files:
85
86
# IntelliJ
87
/out/
88
89
# mpeltonen/sbt-idea plugin
90
.idea_modules/
91
92
# JIRA plugin
93
atlassian-ide-plugin.xml
94
95
# Crashlytics plugin (for Android Studio and IntelliJ)
96
com_crashlytics_export_strings.xml
97
crashlytics.properties
98
crashlytics-build.properties
99
fabric.properties
100
101
=======
102
>>>>>>> 9e1b93afd182b687deb9dbb98efc01bb01e3cb29