Fix borked rebase conflict resolution

2018-02-14 15:07:32 -05:00
parent a26492922d
commit 4a6d8f78f0
1 changed files with 0 additions and 1 deletions
--- 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>

 <%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.