From 455faed6382944be8fcc0535881ea5005305f791 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmyxu1997@berkeley.edu>
Date: Wed, 31 Mar 2021 07:52:55 +0800
Subject: [PATCH] [fix] Remove unmerged code

---
 app/views/schedules/happening_now.haml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/views/schedules/happening_now.haml b/app/views/schedules/happening_now.haml
index 57d077ff..6c3d8f5b 100644
--- a/app/views/schedules/happening_now.haml
+++ b/app/views/schedules/happening_now.haml
@@ -9,19 +9,12 @@
     .col-md-12
       %h2
         #{pluralize(@events_schedules.count, 'Event')} Occurring Within The Next 30 minutes.
-<<<<<<< HEAD
-      %h3
-        This page was loaded at
-        = inyourtz(Time.now) do
-          = Time.now.strftime('%a %b %d at %I:%M %P (%z)')
-=======
         %br
         %small
           This page was loaded at
           = inyourtz(Time.now) do
             = Time.now.strftime('%a %b %d at %I:%M %P (%z)')
           \.
->>>>>>> b194ad8ad6e0af95b48002a350a87a514cd8593a
 
   .row
     / TODO: Clean this up, merge with all events page.