Conflict resolution

imakewebthings · Dec 3, 2013 · 3d8fb53 · 3d8fb53
2 parents 657ac47 + 08a1ebb
commit 3d8fb53
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/boilerplate.html b/boilerplate.html
@@ -77,7 +77,6 @@ <h1>Here</h1>
 <script src="core/deck.core.js"></script>
 
 <!-- Extension JS files. Add or remove as needed. -->
-<script src="core/deck.core.js"></script>
 <script src="extensions/menu/deck.menu.js"></script>
 <script src="extensions/goto/deck.goto.js"></script>
 <script src="extensions/status/deck.status.js"></script>