From da75d15fb1c04c3548a40aecc5869dad87770da7 Mon Sep 17 00:00:00 2001 From: Zosman Date: Tue, 25 Oct 2016 21:30:58 -0400 Subject: [PATCH] Brought back stuff lost in bad merge conflict resolution done by the legendary @yoda --- go/go/templates/link_box.html | 32 ++--- go/go/templates/link_box.html.orig | 195 +++++++++++++++++++++++++++++ 2 files changed, 208 insertions(+), 19 deletions(-) create mode 100644 go/go/templates/link_box.html.orig diff --git a/go/go/templates/link_box.html b/go/go/templates/link_box.html index 0e13fa0..297a85e 100644 --- a/go/go/templates/link_box.html +++ b/go/go/templates/link_box.html @@ -87,25 +87,19 @@ + + + + {% endif %} diff --git a/go/go/templates/link_box.html.orig b/go/go/templates/link_box.html.orig new file mode 100644 index 0000000..19c1edd --- /dev/null +++ b/go/go/templates/link_box.html.orig @@ -0,0 +1,195 @@ +{% load go_extras %} +{% load qr_tags %} + + + +
+
+

Go Address:

+ + +

+ +

Address Details:

+ Target URL: +
+ {{url.target}} +
+<<<<<<< HEAD + Social Media Clicks: {{url.socialclicks}} +
+ + Expires: {{url.expires|default_if_none:"Never"}} +

+ + Delete + + + + Edit + +