From df6ffe9cc6cf8a82e0ca02bfe0dc6a59596f9fbb Mon Sep 17 00:00:00 2001
From: Lorin Werthen <werthenlorin@gmail.com>
Date: Tue, 4 Oct 2016 22:06:02 +0200
Subject: [PATCH] oops

---
 .../assets/stylesheets/includes/general.scss   |  3 ---
 content/index.erb                              | 18 ------------------
 2 files changed, 21 deletions(-)

diff --git a/content/assets/stylesheets/includes/general.scss b/content/assets/stylesheets/includes/general.scss
index ed1fae5..4691d8b 100644
--- a/content/assets/stylesheets/includes/general.scss
+++ b/content/assets/stylesheets/includes/general.scss
@@ -53,8 +53,6 @@ footer.footer {
   color: white;
   background: rgba(255, 127, 0, 0.99);
 }
-<<<<<<< Updated upstream
-=======
 
 .imgcenter {
   display: flex;
@@ -98,4 +96,3 @@ footer.footer {
     padding-right: 5px;
   }
 }
->>>>>>> Stashed changes
diff --git a/content/index.erb b/content/index.erb
index 7dabac3..da6f9d2 100644
--- a/content/index.erb
+++ b/content/index.erb
@@ -38,28 +38,10 @@
           </a>
         </div>
       </div>
-<<<<<<< Updated upstream
-      <div class="tile is-vertical is-2">
-        <div class="tile is-parent">
-          <a class="tile box" href="https://github.com/ZeusWPI">
-            <div class="tile is-child imgcenter icon">
-              <%= fa 'github' %>
-            </div>
-          </a>
-        </div>
-          <div class="tile is-parent">
-            <a class="tile box" href="https://www.facebook.com/zeus.wpi/?fref=ts">
-              <div class="tile is-child imgcenter icon">
-                <%= fa 'facebook-official' %>
-              </div>
-            </a>
-          </div>
-=======
       <div class="tile is-parent is-2">
         <a class="tile is-child imgcenter box hydra-tile" href="//student.ugent.be/hydra">
           <%= asset :img, 'hydra-logo.png' %>
         </a>
->>>>>>> Stashed changes
       </div>
     </div>
     <div class="tile">