v1.0.1

creativetimofficial · Aug 21, 2018 · 04ffdfb · 04ffdfb
1 parent c6dc287
commit 04ffdfb
Show file tree

Hide file tree

Showing 63 changed files with 440 additions and 15,183 deletions.
diff --git a/README.md b/README.md
@@ -68,7 +68,6 @@
 <h2 id="download-and-installation">Download and Installation</h2>
 
 <ul>
-<<<<<<< HEAD
   <li><a href="https://github.com/creativetimofficial/argon-design-system/archive/master.zip">Download from Github</a></li>
   <li>
     <p><a href="https://www.creative-tim.com/product/argon-design-system">Download from Creative Tim</a></p>
@@ -86,15 +85,6 @@
     <p>Install with Npm: <code class="highlighter-rouge">npm i argon-design-system-free</code></p>
   </li>
   <li>Install with Yarn: <code class="highlighter-rouge">yarn add argon-design-system-free</code></li>
-=======
-  <li>Install with npm: <code class="highlighter-rouge">npm i argon-design-system-free</code></li>
-  <li>Install with Yarn: <code class="highlighter-rouge">yarn add argon-design-system-free</code></li>
-  <li>Install with Bower: <code class="highlighter-rouge">bower install argon-design-system</code></li>
-  <li><a href="https://github.com/creativetimofficial/argon-design-system/archive/master.zip">Download from Github</a>.</li>
-  <li><a href="https://www.creative-tim.com/product/argon-design-system">Download from Creative Tim</a>.</li>
-  <li>Clone the repo: <code class="highlighter-rouge">git clone https://github.com/creativetimofficial/argon-design-system.git</code>.</li>
-
->>>>>>> 5803185ba70fac5510e1580c57fed28f665dc56f
 </ul>
 
 <h2 id="documentation">Documentation</h2>