Merge pull request #58 from plone/comment_diazo_bundle

Add comment to alert on duplicate resource registering
plone · Dec 5, 2015 · ae6600c · ae6600c
2 parents 64bbc86 + 630b7e1
commit ae6600c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -41,6 +41,9 @@ Fixes:
 - Discard duplicated ids for columns (closes `#1105`_)
   [davilima6]
 
+- Add comment to alert on duplicate resource registering
+  [davilima6]
+
 
 1.6.14 (2015-09-27)
 -------------------

diff --git a/plonetheme/barceloneta/theme/manifest.cfg b/plonetheme/barceloneta/theme/manifest.cfg
@@ -8,10 +8,10 @@ doctype = <!DOCTYPE html>
 enabled-bundles =
 disabled-bundles =
 
+# Resources must be registered either here in the Diazo bundle or in registry.xml
 development-css = /++theme++barceloneta/less/barceloneta.plone.less
 production-css = /++theme++barceloneta/less/barceloneta-compiled.css
 tinymce-content-css = /++theme++barceloneta/less/barceloneta-compiled.css
-
-development-js = 
-production-js = 
+development-js =
+production-js =