gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[fix] Remove unmerged code

Browse source
This commit is contained in:
Jimmy 2021-03-31 07:52:55 +08:00
parent e2f5b5e933
commit 455faed638
1 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/views/schedules/happening_now.haml
View file

@ -9,19 +9,12 @@
.col-md-12 .col-md-12
%h2 %h2
#{pluralize(@events_schedules.count, 'Event')} Occurring Within The Next 30 minutes. #{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 %br
%small %small
This page was loaded at This page was loaded at
= inyourtz(Time.now) do = inyourtz(Time.now) do
= Time.now.strftime('%a %b %d at %I:%M %P (%z)') = Time.now.strftime('%a %b %d at %I:%M %P (%z)')
\. \.
>>>>>>> b194ad8ad6e0af95b48002a350a87a514cd8593a
.row .row
/ TODO: Clean this up, merge with all events page. / TODO: Clean this up, merge with all events page.