From e3d09333c4a288697145b3c2342a3c45d27131be Mon Sep 17 00:00:00 2001 From: rjy7 Date: Wed, 21 Jul 2010 22:02:11 +0000 Subject: [PATCH] Merge r5371:5373 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint --- webapp/config/licenser/known_exceptions.txt | 3 +++ webapp/web/templates/freemarker/page/partials/doctype.html | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/webapp/config/licenser/known_exceptions.txt b/webapp/config/licenser/known_exceptions.txt index 58e9880fc..74fcc4c70 100644 --- a/webapp/config/licenser/known_exceptions.txt +++ b/webapp/config/licenser/known_exceptions.txt @@ -18,6 +18,9 @@ # The AI ingest files are exceptions -- until we decide otherwise. utilities/ingest/**/* +# Doctype declaration +webapp/web/templates/freemarker/page/partials/doctype.html + # ContentType from Google gdata API, Apache 2.0 license included in file. webapp/src/edu/cornell/mannlib/vitro/webapp/web/ContentType.java diff --git a/webapp/web/templates/freemarker/page/partials/doctype.html b/webapp/web/templates/freemarker/page/partials/doctype.html index 08aba3bbf..141b48874 100644 --- a/webapp/web/templates/freemarker/page/partials/doctype.html +++ b/webapp/web/templates/freemarker/page/partials/doctype.html @@ -1,5 +1,3 @@ - - \ No newline at end of file