diff options
| author | Marc Englund <marc@vaadin.com> | 2012-10-01 11:28:38 +0300 |
|---|---|---|
| committer | Marc Englund <marc@vaadin.com> | 2012-10-01 11:28:38 +0300 |
| commit | d2db8f9054376b9b817f170426ef6a9f27990b0f (patch) | |
| tree | d963a73ef5dd2eab335b3a146d871511bf14af1d /theme-compiler/src/com/vaadin/sass/tree/VariableNode.java | |
| parent | d2d5bace48009de6e2ad46a9c73ce367eecd9bf1 (diff) | |
| parent | ea179b1a676a12d153878860a74055fac5dc6922 (diff) | |
| download | vaadin-framework-d2db8f9054376b9b817f170426ef6a9f27990b0f.tar.gz vaadin-framework-d2db8f9054376b9b817f170426ef6a9f27990b0f.zip | |
Merge branch 'master' into sass
Conflicts:
WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss
theme-compiler/src/com/vaadin/sass/tree/ListRemoveNode.java
theme-compiler/src/com/vaadin/sass/visitor/EachVisitor.java
Diffstat (limited to 'theme-compiler/src/com/vaadin/sass/tree/VariableNode.java')
| -rw-r--r-- | theme-compiler/src/com/vaadin/sass/tree/VariableNode.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/theme-compiler/src/com/vaadin/sass/tree/VariableNode.java b/theme-compiler/src/com/vaadin/sass/tree/VariableNode.java index d18ff54138..8c360c4a56 100644 --- a/theme-compiler/src/com/vaadin/sass/tree/VariableNode.java +++ b/theme-compiler/src/com/vaadin/sass/tree/VariableNode.java @@ -71,7 +71,7 @@ public class VariableNode extends Node implements IVariableNode { @Override public void replaceVariables(ArrayList<VariableNode> variables) { for (final VariableNode node : variables) { - if (!this.equals(node)) { + if (!equals(node)) { if (name.equals(node.getName())) { expr = (LexicalUnitImpl) DeepCopy.copy(node.getExpr()); |