From c5b17d791e27a55b21123e13e1dccfdf5e5dd3fb Mon Sep 17 00:00:00 2001
From: Daniel Romotsky <romotsky@gmail.com>
Date: Fri, 19 May 2023 13:30:31 -0700
Subject: [PATCH] fix errors

---
 index.html | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/index.html b/index.html
index 7fe03b89..a10001a8 100644
--- a/index.html
+++ b/index.html
@@ -260,19 +260,14 @@ <h2 class="page-section-heading text-center text-uppercase text-secondary mb-0">
           -- Snowflake, DBT, SQL -->
             <img class="img-skills" src="img/skills/r.png" alt="">
             <img class="img-skills" src="img/skills/github.png" alt="">
-<<<<<<< HEAD
             <img class="img-skills" src="img/skills/snowflake.png" alt="">
             <img class="img-skills" src="img/skills/dbt.png" alt="">
             <img class="img-skills" src="img/skills/bigquery.png" alt="">
             <img class="img-skills" src="img/skills/hue.png" alt="">
             <img class="img-skills" src="img/skills/sql.png" alt="">
-=======
             <!-- <img class="img-skills" src="img/skills/hadoop.png" alt=""> -->
             <!-- <img class="img-skills" src="img/skills/python.png" alt=""> -->
-            <img class="img-skills" src="img/skills/bigquery.png" alt="">
-            <img class="img-skills" src="img/skills/hue.png" alt="">
             <!-- <img class="img-skills" src="img/skills/html.png" alt=""> -->
->>>>>>> refs/remotes/origin/master
             <!-- <img class="img-skills" src="img/skills/css.png" alt=""> -->
           </u1>
         </div>
@@ -300,15 +295,12 @@ <h2 class="page-section-heading text-center text-uppercase text-secondary mb-0">
           <img class="img-skills" src="img/skills/rstudio.png" alt="">
           <img class="img-skills" src="img/skills/googledatastudio.png" alt="">
           <!-- -- amplitude, mixpanel, segment,  -->
-<<<<<<< HEAD
           <img class="img-skills" src="img/skills/amplitude.png" alt="">     
           <img class="img-skills" src="img/skills/segment.png" alt="">
            <img class="img-skills" src="img/skills/tidyverse.png" alt="">
-=======
           <!-- <img class="img-skills" src="img/skills/photoshop.png" alt="">      -->
           <!-- <img class="img-skills" src="img/skills/premiere.png" alt=""> -->
            <!-- <img class="img-skills" src="img/skills/msoffice.png" alt=""> -->
->>>>>>> refs/remotes/origin/master
         </div>
       </div>
       </div>