Merge branch 'master' into HEAD

[rails.git] / app / assets / config / manifest.js

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
index 97d6f8b98189d46b0e0a8c41330b2748238345c2..33a4d7c323d042def8973f6c8db88fcd6bd8a52c 100644 (file)
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -19,14 +19,6 @@
 
 //= link_directory ../../../vendor/assets/polyfill .js
 
-//= link_directory ../../../vendor/assets/potlatch2/help
-//= link_tree ../../../vendor/assets/potlatch2 .swf
-//= link_tree ../../../vendor/assets/potlatch2 .zip
-
-//= link_directory ../../../vendor/assets/swfobject
-
-//= link html5shiv/dist/html5shiv.js
-
 //= link leaflet/dist/images/marker-icon.png
 //= link leaflet/dist/images/marker-icon-2x.png
 //= link leaflet/dist/images/marker-shadow.png