mend

modethirteen · modethirteen · commit ad714b70b9cb · 2020-12-15T14:04:41.000-08:00
diff --git a/composer.json b/composer.json
@@ -1,9 +1,5 @@
 {
-<<<<<<< HEAD
   "name": "modethirteen/type-ex",
-=======
-  "name": "modethirteen/type-extensions",
->>>>>>> a66d45515c18a7a2525c3033728d29863b0c26bb
   "description": "A collection of useful behavior extensions for PHP",
   "type": "library",
   "license": "Apache-2.0",
