Skip to content

Commit 5c2e411

Browse files
committed
Merge branch 'd/update-.gitignore' of https://github.com/doneill/geometry-api-java into doneill-d/update-.gitignore
Conflicts: .gitignore
2 parents 1066a87 + 7d1f9c8 commit 5c2e411

1 file changed

Lines changed: 25 additions & 2 deletions

File tree

.gitignore

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,28 @@ esri-geometry-api.jar
66
.classpath
77
description.jardesc
88
*.bak
9-
.settings
10-
target/
9+
10+
# Intellij project files
11+
*.iml
12+
*.ipr
13+
*.iws
14+
.idea/
15+
16+
# Eclipse project files
17+
.settings/
18+
libs/
19+
20+
# SublimeText
21+
/*.sublime-project
22+
*.sublime-workspace
23+
24+
# OS generated files #
25+
######################
26+
.DS_Store
27+
.DS_Store?
28+
._*
29+
.Spotlight-V100
30+
.Trashes
31+
Icon?
32+
ehthumbs.db
33+
Thumbs.db

0 commit comments

Comments
 (0)