Skip to content

Commit 1a9f451

Browse files
author
jorge
committed
fix conflicts
1 parent 154fda7 commit 1a9f451

10 files changed

Lines changed: 0 additions & 44 deletions

File tree

‎boat-engine/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
<parent>
66
<groupId>com.backbase.oss</groupId>
77
<artifactId>backbase-openapi-tools</artifactId>
8-
<<<<<<< HEAD
9-
<version>0.15.4-SNAPSHOT</version>
10-
=======
118
<version>0.15.6-SNAPSHOT</version>
12-
>>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f
139
</parent>
1410
<artifactId>boat-engine</artifactId>
1511
<packaging>jar</packaging>

‎boat-maven-plugin/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
<parent>
66
<groupId>com.backbase.oss</groupId>
77
<artifactId>backbase-openapi-tools</artifactId>
8-
<<<<<<< HEAD
9-
<version>0.15.4-SNAPSHOT</version>
10-
=======
118
<version>0.15.6-SNAPSHOT</version>
12-
>>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f
139
</parent>
1410
<artifactId>boat-maven-plugin</artifactId>
1511

‎boat-quay/boat-quay-lint/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
<parent>
66
<groupId>com.backbase.oss</groupId>
77
<artifactId>boat-quay</artifactId>
8-
<<<<<<< HEAD
9-
<version>0.15.4-SNAPSHOT</version>
10-
=======
118
<version>0.15.6-SNAPSHOT</version>
12-
>>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f
139
</parent>
1410

1511
<artifactId>boat-quay-lint</artifactId>

‎boat-quay/boat-quay-rules/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
<parent>
66
<groupId>com.backbase.oss</groupId>
77
<artifactId>boat-quay</artifactId>
8-
<<<<<<< HEAD
9-
<version>0.15.4-SNAPSHOT</version>
10-
=======
118
<version>0.15.6-SNAPSHOT</version>
12-
>>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f
139
</parent>
1410

1511
<artifactId>boat-quay-rules</artifactId>

‎boat-quay/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
<parent>
66
<groupId>com.backbase.oss</groupId>
77
<artifactId>backbase-openapi-tools</artifactId>
8-
<<<<<<< HEAD
9-
<version>0.15.4-SNAPSHOT</version>
10-
=======
118
<version>0.15.6-SNAPSHOT</version>
12-
>>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f
139
</parent>
1410

1511

‎boat-scaffold/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
<parent>
66
<groupId>com.backbase.oss</groupId>
77
<artifactId>backbase-openapi-tools</artifactId>
8-
<<<<<<< HEAD
9-
<version>0.15.4-SNAPSHOT</version>
10-
=======
118
<version>0.15.6-SNAPSHOT</version>
12-
>>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f
139
</parent>
1410

1511
<artifactId>boat-scaffold</artifactId>
@@ -91,11 +87,7 @@
9187
<dependency>
9288
<groupId>com.backbase.oss</groupId>
9389
<artifactId>boat-trail-resources</artifactId>
94-
<<<<<<< HEAD
95-
<version>0.15.4-SNAPSHOT</version>
96-
=======
9790
<version>0.15.6-SNAPSHOT</version>
98-
>>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f
9991
<scope>test</scope>
10092
</dependency>
10193
</dependencies>

‎boat-terminal/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
<parent>
66
<groupId>com.backbase.oss</groupId>
77
<artifactId>backbase-openapi-tools</artifactId>
8-
<<<<<<< HEAD
9-
<version>0.15.4-SNAPSHOT</version>
10-
=======
118
<version>0.15.6-SNAPSHOT</version>
12-
>>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f
139
</parent>
1410

1511
<artifactId>boat-terminal</artifactId>

‎boat-trail-resources/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
<parent>
66
<groupId>com.backbase.oss</groupId>
77
<artifactId>backbase-openapi-tools</artifactId>
8-
<<<<<<< HEAD
9-
<version>0.15.4-SNAPSHOT</version>
10-
=======
118
<version>0.15.6-SNAPSHOT</version>
12-
>>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f
139
</parent>
1410

1511
<artifactId>boat-trail-resources</artifactId>

‎pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@
44

55
<groupId>com.backbase.oss</groupId>
66
<artifactId>backbase-openapi-tools</artifactId>
7-
<<<<<<< HEAD
8-
<version>0.15.4-SNAPSHOT</version>
9-
=======
107
<version>0.15.6-SNAPSHOT</version>
118

12-
>>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f
139
<packaging>pom</packaging>
1410
<description>Backbase Open Api Tools will help you converting RAML to OpenAPI plus many more</description>
1511

‎tests/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
<parent>
66
<groupId>com.backbase.oss</groupId>
77
<artifactId>backbase-openapi-tools</artifactId>
8-
<<<<<<< HEAD
9-
<version>0.15.4-SNAPSHOT</version>
10-
=======
118
<version>0.15.6-SNAPSHOT</version>
12-
>>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f
139
</parent>
1410

1511
<artifactId>tests</artifactId>

0 commit comments

Comments
 (0)