From 2e148fc2c1bf40a9ac969c4a7c7eb0433e5a96f8 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Mon, 29 Jan 2018 18:11:13 +0000
Subject: [PATCH] FIXUP: merge errors

---
 .../funds/templates/public_funds/includes/fund_apply_cta.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opentech/public/funds/templates/public_funds/includes/fund_apply_cta.html b/opentech/public/funds/templates/public_funds/includes/fund_apply_cta.html
index 433628309..6219720d7 100644
--- a/opentech/public/funds/templates/public_funds/includes/fund_apply_cta.html
+++ b/opentech/public/funds/templates/public_funds/includes/fund_apply_cta.html
@@ -8,7 +8,7 @@
                 <h5 class="apply-bar__subheading">{% trans "Next deadline" %}</h5>
                 <h3 class="apply-bar__heading">
                     <svg class="icon icon--calendar apply-bar__icon"><use xlink:href="#calendar"></use></svg>
-                    <span>{{ fund_type.deadline|date:"M j, Y" }}</span>
+                    <span>{{ fund_page.deadline|date:"M j, Y" }}</span>
                 </h3>
               </div>
             {% endif %}
-- 
GitLab