projects
/
mkjsf-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
a58b9b5
)
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkjsf
author
Niels Erik G. Nielsen
<nielserik@indexdata.com>
Thu, 27 Jun 2013 20:44:52 +0000
(16:44 -0400)
committer
Niels Erik G. Nielsen
<nielserik@indexdata.com>
Thu, 27 Jun 2013 20:44:52 +0000
(16:44 -0400)
Conflicts:
pom.xml
pom.xml
patch
|
blob
|
history
diff --git
a/pom.xml
b/pom.xml
index
0b7170f
..
c79777f
100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-1,3
+1,4
@@
+<<<<<<< HEAD
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
\r
<modelVersion>4.0.0</modelVersion>
\r
<groupId>com.indexdata</groupId>
\r
@@
-194,4
+195,4
@@
</build>
\r
</profile>
\r
</profiles>
\r
-</project>
\r
+</project>
\ No newline at end of file