From be1cf0a5f717b644e7ca108cb4e1af55e4e1fdd8 Mon Sep 17 00:00:00 2001 From: "radeljic_ivan@hotmail.com" Date: Wed, 5 Oct 2016 07:51:35 +0200 Subject: [PATCH 1/2] No hotlinking --- img/loading_spinner.gif | Bin 0 -> 15235 bytes views/home.html | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 img/loading_spinner.gif diff --git a/img/loading_spinner.gif b/img/loading_spinner.gif new file mode 100644 index 0000000000000000000000000000000000000000..d101a1d97b2e7ac8e6ee724156c76aba68d0c9c2 GIT binary patch literal 15235 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 vK3oXGT#?|k(!N$IVFe+C?S
- +
From 1227f13dfa3a26aa75e408bca8cf902eb2f1c060 Mon Sep 17 00:00:00 2001 From: "radeljic_ivan@hotmail.com" Date: Wed, 5 Oct 2016 08:04:55 +0200 Subject: [PATCH 2/2] Resolve conflicts from #ad331f6 --- views/home.html | 49 ++++++------------------------------------------- 1 file changed, 6 insertions(+), 43 deletions(-) diff --git a/views/home.html b/views/home.html index a4023b3..87f55ef 100644 --- a/views/home.html +++ b/views/home.html @@ -34,28 +34,6 @@

{{ovaRadionica.ime}}

Dodaj radionicu -<<<<<<< HEAD - - -
-

DOGAĐAJI

-
-
-

{{event.ime}}

- -

{{event.mesto}}

-||||||| merged common ancestors -
- -
-

DOGAĐAJI

-
-
-

{{event.ime}}

- -

{{event.mesto}}

-======= -

DOGAĐAJI

@@ -65,30 +43,15 @@

{{event.ime}}

{{event.mesto}}

->>>>>>> origin/master
-<<<<<<< HEAD -
-
-

{{thisEvent.ime}}

- -

{{thisEvent.mesto}}

-
-
-||||||| merged common ancestors -
-

{{thisEvent.ime}}

- -

{{thisEvent.mesto}}

-
-======= -
-

{{thisEvent.ime}}

- -

{{thisEvent.mesto}}

+
+
+

{{thisEvent.ime}}

+ +

{{thisEvent.mesto}}

+
->>>>>>> origin/master