diff options
| author | nagarjun <nagarjun@gnowledge.org> | 2012-07-13 15:26:51 +0530 |
|---|---|---|
| committer | nagarjun <nagarjun@gnowledge.org> | 2012-07-13 15:26:51 +0530 |
| commit | 25261ae70442eabc1b26ddfbbd923b04a3ffb9f1 (patch) | |
| tree | a3cc591c1cfe40c7a6a2c5e49db015d9329c94ad /gstudio/templates/gstudio/skeleton.html | |
| parent | 18a4b832a5c39f1ab765285999da0881ac6c02d1 (diff) | |
| download | gnowsys-25261ae70442eabc1b26ddfbbd923b04a3ffb9f1.tar.gz | |
minor edit in skeleton.html
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 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 %} |