merged conflict

2026-08-21 21:44:18 +00:00 · 2018-06-28 17:11:56 +08:00
parent 93a5e93ce2 49abcb4923
commit 7a23b4ed3c
37 changed files with 7961 additions and 255 deletions
@@ -28,6 +28,9 @@
        <env name="SESSION_DRIVER" value="array"/>
        <env name="QUEUE_DRIVER" value="sync"/>
        <env name="DB_CONNECTION" value="testing"/>
+<<<<<<< HEAD
        <env name="MAIL_DRIVER" value="array"/>
+=======
+>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106
    </php>
 </phpunit>