merge

composer.lock

@@ -342,16 +342,16 @@
         },
         {
             "name": "shish/ffsphp",
-            "version": "v0.0.1",
+            "version": "v0.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/shish/ffsphp.git",
-                "reference": "6b1874cf05b0b6bbdf7b118ca081097d1f830cd7"
+                "reference": "16c98d57c80bb4848f20253c8c1e5fe7f6c5823f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/shish/ffsphp/zipball/6b1874cf05b0b6bbdf7b118ca081097d1f830cd7",
-                "reference": "6b1874cf05b0b6bbdf7b118ca081097d1f830cd7",
+                "url": "https://api.github.com/repos/shish/ffsphp/zipball/16c98d57c80bb4848f20253c8c1e5fe7f6c5823f",
+                "reference": "16c98d57c80bb4848f20253c8c1e5fe7f6c5823f",
                 "shasum": ""
             },
             "require": {
@@ -380,7 +380,7 @@
             ],
             "description": "A collection of workarounds for stupid PHP things",
             "homepage": "https://github.com/shish/ffsphp",
-            "time": "2019-11-25T15:37:09+00:00"
+            "time": "2019-11-29T12:00:09+00:00"
         },
         {
             "name": "shish/microcrud",
@@ -429,7 +429,15 @@
                 "crud",
                 "generator"
             ],
+<<<<<<< HEAD
             "time": "2019-11-29T02:11:55+00:00"
+=======
+<<<<<<< HEAD
+            "time": "2019-11-29T21:15:17+00:00"
+=======
+            "time": "2019-11-29T10:55:02+00:00"
+>>>>>>> e926b15d5ffeb6f7c0510acacaaa846294212f5c
+>>>>>>> 0a330cd0baebc7f9387fd63a36a88c38d4338a0f
         },
         {
             "name": "shish/microhtml",