]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Resolve conflict - docs/partials/component-list.html
authorharry <harmanmanchanda182@gmail.com>
Wed, 17 May 2017 15:29:58 +0000 (20:59 +0530)
committerharry <harmanmanchanda182@gmail.com>
Wed, 17 May 2017 15:29:58 +0000 (20:59 +0530)
docs/partials/component-list.html

index 609d9445c3a164fe8d1b8f5460cf435bafae813e..07e515813886d20e8cb9fce366280fc7a01abc1c 100644 (file)
@@ -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>