Skip to content

Commit

Permalink
Conflict resolusion
Browse files Browse the repository at this point in the history
  • Loading branch information
erandasooriyabandara committed Feb 3, 2014
1 parent 3e53ab7 commit 54bc237
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,6 @@
<organization>Software AG</organization>
</contributor>
</contributors>
<<<<<<< HEAD

<repositories>
<repository>
Expand Down

0 comments on commit 54bc237

Please sign in to comment.