+0
−8
| Original line number | Diff line number | Diff line |
|---|---|---|
| @@ -36,7 +36,6 @@ | ||
"type": "package",
|
||
"package": {
|
||
"name": "dinbror/blazy",
|
||
<<<<<<< HEAD
|
||
"version": "1.8.2",
|
||
"type": "drupal-library",
|
||
"extra": {
|
||
| @@ -46,13 +45,6 @@ | ||
"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
|
||
}
|
||
}
|
||
}
|
||
database/development.sql
0 → 100644
+6487
−0
File added.
Preview size limit exceeded, changes collapsed.
database/development.sql.gz
deleted100644 → 0
−1.43 MiB
+22
−0
+8
−0
Loading