From: harry <harmanmanchanda182@gmail.com>
Date: Wed, 17 May 2017 15:29:58 +0000 (+0530)
Subject: Resolve conflict - docs/partials/component-list.html
X-Git-Tag: v6.4.0-rc1~23^2~20^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fd709a432308ab7022de01344f0961f54b02653;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Resolve conflict - docs/partials/component-list.html
---

diff --git a/docs/partials/component-list.html b/docs/partials/component-list.html
index 609d9445c..07e515813 100644
--- a/docs/partials/component-list.html
+++ b/docs/partials/component-list.html
@@ -17,7 +17,6 @@
   <li{{#ifpage 'flexbox'}} class="current"{{/ifpage}}><a href="flexbox.html">Flexbox</a></li>
   <li{{#ifpage 'sass'}} class="current"{{/ifpage}}><a href="sass.html">Sass</a></li>
   <li{{#ifpage 'javascript'}} class="current"{{/ifpage}}><a href="javascript.html">JavaScript</a></li>
-  <li{{#ifpage 'prototyping'}} class="current"{{/ifpage}}><a href="prototyping.html">Prototyping Utilities</a></li>
   <li{{#ifpage 'javascript-utilities'}} class="current"{{/ifpage}}><a href="javascript-utilities.html">JavaScript Utilities</a></li>
   <li{{#ifpage 'media-queries'}} class="current"{{/ifpage}}><a href="media-queries.html">Media Queries</a></li>