Merge pull request #14 from rwth-acis/development

Development
rwth-acis · Mar 26, 2018 · 2fa7008 · 2fa7008
2 parents 2ae6e11 + 849df9a
commit 2fa7008
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,7 @@
 /tmp/
 /log/
 /lib/
-ivy.jar
+/etc/ivy/ivy.jar
 /service/
 /out/
 /.idea/
@@ -14,6 +14,6 @@ ivy.jar
 /.settings/
 /junitvmwatcher*.properties
 /junit*.properties
-/etc/
+/etc/startup/
 *.secret
 archiva_credentials.xml
diff --git a/template.conf b/template.conf
diff --git a/template.service b/template.service