Fixes merge error
authorNiels Erik G. Nielsen <nielserik@indexdata.com>
Thu, 27 Jun 2013 20:47:10 +0000 (16:47 -0400)
committerNiels Erik G. Nielsen <nielserik@indexdata.com>
Thu, 27 Jun 2013 20:47:10 +0000 (16:47 -0400)
commit5d68ffebf6d5bea672a6dfb93563a772b9073f74
tree2923f1978ad360d5a20025f1b5985f9f68e4fc33
parent1d3e5272a80d5890a3618912e6799f436dc2911b
Fixes merge error
pom.xml