composer.json

@@ -36,6 +36,7 @@
             "type": "package",
             "package": {
                 "name": "dinbror/blazy",
+<<<<<<< HEAD
                 "version": "1.8.2",
                 "type": "drupal-library",
                 "extra": {
@@ -45,6 +46,13 @@
                     "type": "git",
                     "url": "https://github.com/dinbror/blazy",
                     "reference": "1.8.2"
+=======
+                "version": "master",
+                "type": "drupal-library",
+                "dist": {
+                    "url": "https://github.com/dinbror/blazy/archive/master.zip",
+                    "type": "zip"
+>>>>>>> udpated core; added blazy library to composer
                 }
             }
         }
@@ -166,6 +174,7 @@
         "drupal/email_registration": "^1.0@RC",
         "drupal/slick": "^1.0",
         "kenwheeler/slick": "*",
+        "dinbror/blazy": "*",
         "drupal/slick_views": "1.x-dev",
         "bower-asset/slick-carousel": "^1.7",
         "drupal/diff": "^1.0",
@@ -192,8 +201,7 @@
         "drupal/smtp": "1.x-dev",
         "drupal/flood_unblock": "^1.5",
         "drupal/field_permissions": "^1.0@RC",
-        "drupal/entity_browser_enhanced": "^1.0@RC",
-        "dinbror/blazy": "^1.8"
+        "drupal/entity_browser_enhanced": "^1.0@RC"
     },
     "scripts": {
         "pre-autoload-dump": "Drupal\\Core\\Composer\\Composer::preAutoloadDump",

sites/default/services.yml

@@ -55,7 +55,7 @@ parameters:
     #
     # Not recommended in production environments
     # @default false
-    debug: false
+    debug: true
     # Twig auto-reload:
     #
     # Automatically recompile Twig templates whenever the source code changes.