diff --git a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/.openapi-generator/VERSION deleted file mode 100644 index b6e020eacc7..00000000000 --- a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/.openapi-generator/VERSION +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -7.0.0-SNAPSHOT -======= -6.1.0-SNAPSHOT ->>>>>>> origin/master diff --git a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/.openapi-generator/VERSION deleted file mode 100644 index b6e020eacc7..00000000000 --- a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -7.0.0-SNAPSHOT -======= -6.1.0-SNAPSHOT ->>>>>>> origin/master diff --git a/samples/client/petstore/typescript-angular-v11-oneOf/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v11-oneOf/builds/default/.openapi-generator/VERSION deleted file mode 100644 index b6e020eacc7..00000000000 --- a/samples/client/petstore/typescript-angular-v11-oneOf/builds/default/.openapi-generator/VERSION +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -7.0.0-SNAPSHOT -======= -6.1.0-SNAPSHOT ->>>>>>> origin/master diff --git a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/.openapi-generator/VERSION deleted file mode 100644 index b6e020eacc7..00000000000 --- a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/.openapi-generator/VERSION +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -7.0.0-SNAPSHOT -======= -6.1.0-SNAPSHOT ->>>>>>> origin/master diff --git a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/.openapi-generator/VERSION deleted file mode 100644 index b6e020eacc7..00000000000 --- a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -7.0.0-SNAPSHOT -======= -6.1.0-SNAPSHOT ->>>>>>> origin/master diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/.openapi-generator/VERSION deleted file mode 100644 index b6e020eacc7..00000000000 --- a/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/.openapi-generator/VERSION +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -7.0.0-SNAPSHOT -======= -6.1.0-SNAPSHOT ->>>>>>> origin/master diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/.openapi-generator/VERSION deleted file mode 100644 index b6e020eacc7..00000000000 --- a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/.openapi-generator/VERSION +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -7.0.0-SNAPSHOT -======= -6.1.0-SNAPSHOT ->>>>>>> origin/master diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/.openapi-generator/VERSION deleted file mode 100644 index b6e020eacc7..00000000000 --- a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -7.0.0-SNAPSHOT -======= -6.1.0-SNAPSHOT ->>>>>>> origin/master