pom conflict solved 3/head
authorrasa <fiammara@gmail.com>
Mon, 14 Oct 2019 13:47:58 +0000 (16:47 +0300)
committerrasa <fiammara@gmail.com>
Mon, 14 Oct 2019 13:47:58 +0000 (16:47 +0300)
commitb78304a13949726819f6f8cd2dad2b8f10388f6b
treec1bb759fb2d6594c7cbb61185afdb2b97300caeb
parentb846a9ee7056e6504129580d0e174d7841b608c5
parent8a547cdf7017c95c4461389074f2417e16d44ec7
pom conflict solved
juneau-petstore-server/pom.xml