Skip to content

Commit c289982

Browse files
wing328wing328
committed
fix merge conflicts
1 parent f0f13cf commit c289982

14 files changed

Lines changed: 0 additions & 56 deletions

File tree

‎samples/client/petstore/ruby-autoload/spec/api_client_spec.rb‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
The version of the OpenAPI document: 1.0.0
77
88
Generated by: https://openapi-generator.tech
9-
<<<<<<< HEAD
109
OpenAPI Generator version: 8.0.0-SNAPSHOT
11-
=======
12-
OpenAPI Generator version: 7.2.0-SNAPSHOT
13-
>>>>>>> origin/master
1410
1511
=end
1612

‎samples/client/petstore/ruby-autoload/spec/configuration_spec.rb‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
The version of the OpenAPI document: 1.0.0
77
88
Generated by: https://openapi-generator.tech
9-
<<<<<<< HEAD
109
OpenAPI Generator version: 8.0.0-SNAPSHOT
11-
=======
12-
OpenAPI Generator version: 7.2.0-SNAPSHOT
13-
>>>>>>> origin/master
1410
1511
=end
1612

‎samples/client/petstore/ruby-faraday/spec/api_client_spec.rb‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
The version of the OpenAPI document: 1.0.0
77
88
Generated by: https://openapi-generator.tech
9-
<<<<<<< HEAD
109
OpenAPI Generator version: 8.0.0-SNAPSHOT
11-
=======
12-
OpenAPI Generator version: 7.2.0-SNAPSHOT
13-
>>>>>>> origin/master
1410
1511
=end
1612

‎samples/client/petstore/ruby-faraday/spec/configuration_spec.rb‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
The version of the OpenAPI document: 1.0.0
77
88
Generated by: https://openapi-generator.tech
9-
<<<<<<< HEAD
109
OpenAPI Generator version: 8.0.0-SNAPSHOT
11-
=======
12-
OpenAPI Generator version: 7.2.0-SNAPSHOT
13-
>>>>>>> origin/master
1410
1511
=end
1612

‎samples/client/petstore/ruby-httpx/spec/api_client_spec.rb‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
The version of the OpenAPI document: 1.0.0
77
88
Generated by: https://openapi-generator.tech
9-
<<<<<<< HEAD
109
OpenAPI Generator version: 8.0.0-SNAPSHOT
11-
=======
12-
OpenAPI Generator version: 7.2.0-SNAPSHOT
13-
>>>>>>> origin/master
1410
1511
=end
1612

‎samples/client/petstore/ruby-httpx/spec/configuration_spec.rb‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
The version of the OpenAPI document: 1.0.0
77
88
Generated by: https://openapi-generator.tech
9-
<<<<<<< HEAD
109
OpenAPI Generator version: 8.0.0-SNAPSHOT
11-
=======
12-
OpenAPI Generator version: 7.2.0-SNAPSHOT
13-
>>>>>>> origin/master
1410
1511
=end
1612

‎samples/client/petstore/ruby/spec/api_client_spec.rb‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
The version of the OpenAPI document: 1.0.0
77
88
Generated by: https://openapi-generator.tech
9-
<<<<<<< HEAD
109
OpenAPI Generator version: 8.0.0-SNAPSHOT
11-
=======
12-
OpenAPI Generator version: 7.2.0-SNAPSHOT
13-
>>>>>>> origin/master
1410
1511
=end
1612

‎samples/client/petstore/ruby/spec/configuration_spec.rb‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
The version of the OpenAPI document: 1.0.0
77
88
Generated by: https://openapi-generator.tech
9-
<<<<<<< HEAD
109
OpenAPI Generator version: 8.0.0-SNAPSHOT
11-
=======
12-
OpenAPI Generator version: 7.2.0-SNAPSHOT
13-
>>>>>>> origin/master
1410
1511
=end
1612

‎samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api_client_spec.rb‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
The version of the OpenAPI document: 1.0.0
77
88
Generated by: https://openapi-generator.tech
9-
<<<<<<< HEAD
109
OpenAPI Generator version: 8.0.0-SNAPSHOT
11-
=======
12-
OpenAPI Generator version: 7.2.0-SNAPSHOT
13-
>>>>>>> origin/master
1410
1511
=end
1612

‎samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/configuration_spec.rb‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
The version of the OpenAPI document: 1.0.0
77
88
Generated by: https://openapi-generator.tech
9-
<<<<<<< HEAD
109
OpenAPI Generator version: 8.0.0-SNAPSHOT
11-
=======
12-
OpenAPI Generator version: 7.2.0-SNAPSHOT
13-
>>>>>>> origin/master
1410
1511
=end
1612

0 commit comments

Comments
 (0)