merge remote

inhere · inhere · commit 9630d457c36f · 2019-01-04T23:42:02.000+08:00
diff --git a/composer.json b/composer.json
@@ -22,7 +22,11 @@
   },
   "autoload": {
     "psr-4": {
+<<<<<<< HEAD
       "Toolkit\\File\\Parse\\": "src/"
+=======
+      "Toolkit\\File\\Parse\\" : "src/"
+>>>>>>> 54f70647d1f38987bffbff758f41cb542c0d8212
     }
   },
   "suggest": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,7 +8,6 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          stopOnFailure="false"
-
 >
   <testsuites>
     <testsuite name="Php Library Test Suite">

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`convertNoticesToExceptions="true"`
`9`	`9`	`convertWarningsToExceptions="true"`
`10`	`10`	`stopOnFailure="false"`
`11`		`-`
`12`	`11`	`>`
`13`	`12`	`<testsuites>`
`14`	`13`	`<testsuite name="Php Library Test Suite">`