added user authentication in order to edit add move markers (bzr coinflicts resolved...

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index fd06fad0862f6c7c3b4de6a917d67903867df8b7..4eab3a36ea7bafa021ea747789b0845fd36e30e1 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -25,7 +25,7 @@
     load_player({{ item.approx_duration.as_seconds }});
     
 </script>
-<<<<<<< TREE
+
 
 {% if user.is_authenticated and perms.telemeta.change_mediaitem %}
     <script type='text/javascript'>var CURRENT_USER_NAME="{{ user.username }}";</script>
@@ -33,10 +33,9 @@
     <script type='text/javascript'>var CURRENT_USER_NAME=undefined;</script>
 {% endif %}
 
-    {% endblock %}
-=======
+
 {% endblock %}
->>>>>>> MERGE-SOURCE
+
 
 {% if item %}
 {% block submenu %}