From 0fd709a432308ab7022de01344f0961f54b02653 Mon Sep 17 00:00:00 2001
From: harry <harmanmanchanda182@gmail.com>
Date: Wed, 17 May 2017 20:59:58 +0530
Subject: [PATCH] Resolve conflict - docs/partials/component-list.html

---
 docs/partials/component-list.html | 1 -
 1 file changed, 1 deletion(-)

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>
 
-- 
2.47.2