From 25261ae70442eabc1b26ddfbbd923b04a3ffb9f1 Mon Sep 17 00:00:00 2001 From: nagarjun Date: Fri, 13 Jul 2012 15:26:51 +0530 Subject: minor edit in skeleton.html --- gstudio/templates/gstudio/skeleton.html | 3 --- 1 file changed, 3 deletions(-) (limited to 'gstudio') diff --git a/gstudio/templates/gstudio/skeleton.html b/gstudio/templates/gstudio/skeleton.html index 170c898..d60dccf 100644 --- a/gstudio/templates/gstudio/skeleton.html +++ b/gstudio/templates/gstudio/skeleton.html @@ -1,6 +1,3 @@ -<<<<<<< HEAD - -======= {% load gstudio_tags i18n %} {% get_tags as nodetype_tags %} {% load adminmedia grp_tags %} -- cgit v1.1