openapi
diff --git a/‎.github/assets/repo-header-a3.png‎
11.5 KB b/‎.github/assets/repo-header-a3.png‎
11.5 KB
diff --git a/‎composer.json‎
Lines changed: 0 additions & 4 deletions b/‎composer.json‎
Lines changed: 0 additions & 4 deletions
@@ -1,10 +1,6 @@
 {
     "name": "openapi/openapi-sdk",
-<<<<<<< HEAD
     "description": "Openapi PHP Libraries (https://openapi.com)",
-=======
-    "description": "OpenApi PHP Libraries (https://openapi.com)",
->>>>>>> f44c43c47a8d98159ea0017846374da1be2b1f8c
     "authors": [
         {
             "name": "Altravia",
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "openapi/openapi-sdk",`
`3`		`-<<<<<<< HEAD`
`4`	`3`	`"description": "Openapi PHP Libraries (https://openapi.com)",`
`5`		`-=======`
`6`		`- "description": "OpenApi PHP Libraries (https://openapi.com)",`
`7`		`->>>>>>> f44c43c47a8d98159ea0017846374da1be2b1f8c`
`8`	`4`	`"authors": [`
`9`	`5`	`{`
`10`	`6`	`"name": "Altravia",`