From 4a6d8f78f0a040ddf489325f7c4274cc6756b1f7 Mon Sep 17 00:00:00 2001 From: Tyler Hallada Date: Wed, 14 Feb 2018 15:07:32 -0500 Subject: [PATCH] Fix borked rebase conflict resolution --- common/djangoapps/pipeline_mako/templates/static_content.html | 1 - 1 file changed, 1 deletion(-) diff --git a/common/djangoapps/pipeline_mako/templates/static_content.html b/common/djangoapps/pipeline_mako/templates/static_content.html index a33e5fcaa2..3e48b16cf5 100644 --- a/common/djangoapps/pipeline_mako/templates/static_content.html +++ b/common/djangoapps/pipeline_mako/templates/static_content.html @@ -90,7 +90,6 @@ source, template_path = Loader(engine).load_template_source(path) %>${source | n, decode.utf8} <%def name="studiofrontend(entry)"> ->>>>>>> 2b8c5a14e8... Fix integration of accessibility policy page <%doc> Loads a studio-frontend page, with the necessary context. Context is expected as a dictionary in the body of this tag.