diff options
Diffstat (limited to 'gstudio/templates/gstudio/skeleton.html')
| -rw-r--r-- | gstudio/templates/gstudio/skeleton.html | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/gstudio/templates/gstudio/skeleton.html b/gstudio/templates/gstudio/skeleton.html index 170c8984..d60dccfe 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 %} |