adding subtitle to header

roblib · Nov 19, 2019 · e91683c · e91683c
2 parents ce9a789 + 9afdc2c
commit e91683c
Show file tree

Hide file tree

Showing 35 changed files with 382 additions and 4,292 deletions.
diff --git a/build/css/islandarchives.styles.css b/build/css/islandarchives.styles.css
diff --git a/build/css/islandarchives.styles.css.map b/build/css/islandarchives.styles.css.map
diff --git a/islandarchives.info b/islandarchives.info
@@ -17,6 +17,7 @@ stylesheets[all][] = build/css/islandarchives.styles.css
 scripts[] = build/js/foundation.min.js
 scripts[] = build/js/islandarchives.behaviors.js
 
+<<<<<<< HEAD
 ;-------------- CSS FOAD -------------
 stylesheets[all][] = system.menus.theme.css
 
@@ -25,6 +26,8 @@ stylesheets[all][] = system.menus.theme.css
 ; ========================================
 scripts[]          = libraries/blueimp-gallery/js/blueimp-gallery.js
 stylesheets[all][] = libraries/blueimp-gallery/css/blueimp-gallery.css
+=======
+>>>>>>> 9afdc2c96be3faafa5cae822ee01ea14fbc2e2c4
 
 ; ========================================
 ; Regions

diff --git a/libraries/blueimp-gallery/LICENSE.txt b/libraries/blueimp-gallery/LICENSE.txt