Skip to content
This repository has been archived by the owner on Dec 25, 2017. It is now read-only.

Commit

Permalink
Fixed merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@aftenkap
aftenkap committed Sep 12, 2014
2 parents bad08c3 + d9690b0 commit f4ba70f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

# build files
/target/

2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<groupId>org.jutility</groupId>
<artifactId>jutility</artifactId>
<version>0.1.0-SNAPSHOT</version>
<relativePath>../jutility</relativePath>
<relativePath>../</relativePath>
</parent>

<properties>
Expand Down

0 comments on commit f4ba70f

Please sign in to comment.