summaryrefslogtreecommitdiffstats
path: root/WebContent
diff options
context:
space:
mode:
authorMarc Englund <marc@vaadin.com>2012-10-01 11:30:59 +0300
committerMarc Englund <marc@vaadin.com>2012-10-01 11:30:59 +0300
commit31faeb75ef5c0977acab2c2ca75ecfce2d768949 (patch)
tree232770256179cf723add360300fa5d95b090de44 /WebContent
parentd2db8f9054376b9b817f170426ef6a9f27990b0f (diff)
parent108ead76188fd8b91bddef5252eb875958babbe0 (diff)
downloadvaadin-framework-31faeb75ef5c0977acab2c2ca75ecfce2d768949.tar.gz
vaadin-framework-31faeb75ef5c0977acab2c2ca75ecfce2d768949.zip
Merge branch 'primary-stylename' into sass
Diffstat (limited to 'WebContent')
-rw-r--r--WebContent/META-INF/MANIFEST.MF4
1 files changed, 2 insertions, 2 deletions
diff --git a/WebContent/META-INF/MANIFEST.MF b/WebContent/META-INF/MANIFEST.MF
index 58630c02ef..59499bce4a 100644
--- a/WebContent/META-INF/MANIFEST.MF
+++ b/WebContent/META-INF/MANIFEST.MF
@@ -1,2 +1,2 @@
-Manifest-Version: 1.0
-
+Manifest-Version: 1.0
+