Develop

composer.json

@@ -2,15 +2,7 @@
     "name": "drupal/calculation_fields",
     "description": "Extends Drupal form element API adding new form element type to evaluation math expression using math.js and symfony/expression-language",
     "type": "drupal-module",
-<<<<<<< HEAD
     "homepage": "https://www.drupal.org/project/calculation_fields",
-=======
-    "autoload": {
-        "psr-4": {
-            "Drupal\\calculation_fields\\": "src/"
-        }
-    },
->>>>>>> 1.0.x
     "require": {
         "symfony/expression-language": "^6.3"
     }