Changes in / [7304c7f:582789f]

Files:

• README.md (modified) (2 diffs)
• app/Console/Commands/clearAll.php (added)
• public/assets/js/app.js (modified) (1 diff)

README.md

@@ +1 @@
+<<<<<<< HEAD
+# SaveSpace
+Document management system in PHP
+=======
 <p align="center"><a href="https://laravel.com" target="_blank"><img src="https://raw.githubusercontent.com/laravel/art/master/logo-lockup/5%20SVG/2%20CMYK/1%20Full%20Color/laravel-logolockup-cmyk-red.svg" width="400"></a></p>
 
@@ -63 +67 @@
 
 The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
+>>>>>>> 7304c7f4e9d471fa8974c193daec4fdd86dabe58

public/assets/js/app.js

@@ -834 +834 @@
 
   /***/
-  0: function _(module, exports, __nested_webpack_require_30556__) {
-    __nested_webpack_require_30556__(
+  0: function _(module, exports, __nested_webpack_require_30733__) {
+    __nested_webpack_require_30733__(
     /**/
     "./resources/js/app.js");
 
-    module.exports = __nested_webpack_require_30556__(
+    module.exports = __nested_webpack_require_30733__(
     /**/
     "./public/assets/sass/app.scss");