diff options
author | John Ahlroos <john@vaadin.com> | 2012-10-01 08:46:58 +0300 |
---|---|---|
committer | John Ahlroos <john@vaadin.com> | 2012-10-01 08:46:58 +0300 |
commit | 108ead76188fd8b91bddef5252eb875958babbe0 (patch) | |
tree | f1b330b0cd752fe504870dc797eb4f03b48ed738 /shared | |
parent | 4c92f1927d4cfc81fca41e1ab24b5c95d1b70a68 (diff) | |
parent | dd6301d843522c4c0769bd8381179cc88b6d59a6 (diff) | |
download | vaadin-framework-108ead76188fd8b91bddef5252eb875958babbe0.tar.gz vaadin-framework-108ead76188fd8b91bddef5252eb875958babbe0.zip |
Merge branch 'master' into primary-stylename
Diffstat (limited to 'shared')
-rw-r--r-- | shared/src/com/vaadin/shared/ui/label/ContentMode.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/shared/src/com/vaadin/shared/ui/label/ContentMode.java b/shared/src/com/vaadin/shared/ui/label/ContentMode.java index efdb1acde0..4ae997d5c2 100644 --- a/shared/src/com/vaadin/shared/ui/label/ContentMode.java +++ b/shared/src/com/vaadin/shared/ui/label/ContentMode.java @@ -15,7 +15,6 @@ */ package com.vaadin.shared.ui.label; - /** * Content modes defining how the client should interpret a Label's value. * |