From d498d48ed31bacdf3a2d607336cff5c28dee9fe0 Mon Sep 17 00:00:00 2001
From: Philipp Dieter <philipp.dieter@attic-media.de>
Date: Tue, 23 Nov 2021 00:36:46 +0100
Subject: [PATCH] [CLEANUP] Remove left over orig file

---
 composer.json.orig | 33 ---------------------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 composer.json.orig

diff --git a/composer.json.orig b/composer.json.orig
deleted file mode 100644
index abf0a9e..0000000
--- a/composer.json.orig
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "cjel/templates-aide",
-    "type": "typo3-cms-extension",
-    "description": "",
-    "authors": [
-        {
-            "name": "Philipp Dieter",
-            "role": "Developer"
-        }
-    ],
-    "require": {
-<<<<<<< HEAD
-        "typo3/cms-core": "8.7.0 - 9.5.99",
-        "sarhan/php-flatten": "^4.0"
-=======
-        "typo3/cms-core": "8.7.0 - 10.99.99"
->>>>>>> 4a4b809d13bd33b85d84f03eba5edb603d74abfb
-    },
-    "autoload": {
-        "psr-4": {
-            "Cjel\\TemplatesAide\\": "Classes"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Cjel\\TemplatesAide\\Tests\\": "Tests"
-        }
-    },
-    "replace": {
-        "templates_aide": "self.version",
-        "typo3-ter/templates-aide": "self.version"
-    }
-}