composer.json fixed

kidunot89 · kidunot89 · commit ab6b03ad1292 · 2020-05-11T21:43:39.000-04:00
diff --git a/composer.json b/composer.json
@@ -33,11 +33,7 @@
         "optimize-autoloader": true
     },
     "autoload": {
-<<<<<<< HEAD
-        "files":[
-=======
         "files": [
->>>>>>> release/v0.5.1
             "includes/connection/wc-cpt-connection-args.php",
             "includes/functions.php"
         ],
