summaryrefslogtreecommitdiffstats
path: root/theme-compiler/tests/resources
diff options
context:
space:
mode:
authorMika Murtojarvi <mika@vaadin.com>2014-02-06 17:09:04 +0200
committerJonatan Kronqvist <jonatan@vaadin.com>2014-02-06 15:17:00 +0000
commit927c497e78e8907c3d62ed4bacbd4b4bcfe1a580 (patch)
tree4e98e966794f503574fc30a2b822acc41995b055 /theme-compiler/tests/resources
parent051460ae2a59f0137d8b58c82492953739814c2d (diff)
parenta705f8cc3fd5804e828b6647510795dbbb99eaa3 (diff)
downloadvaadin-framework-927c497e78e8907c3d62ed4bacbd4b4bcfe1a580.tar.gz
vaadin-framework-927c497e78e8907c3d62ed4bacbd4b4bcfe1a580.zip
Merge commit 'a705f8cc3fd5804e828b6647510795dbbb99eaa3' into
master Change-Id: I163cb7f15a35bc44d9840afa3f35d059e7bf42ee
Diffstat (limited to 'theme-compiler/tests/resources')
-rw-r--r--theme-compiler/tests/resources/sasslang/css/369-test_mixins_with_empty_args.css (renamed from theme-compiler/tests/resources/sasslangbroken/css/369-test_mixins_with_empty_args.css)0
-rw-r--r--theme-compiler/tests/resources/sasslang/scss/369-test_mixins_with_empty_args.scss (renamed from theme-compiler/tests/resources/sasslangbroken/scss/369-test_mixins_with_empty_args.scss)0
2 files changed, 0 insertions, 0 deletions
diff --git a/theme-compiler/tests/resources/sasslangbroken/css/369-test_mixins_with_empty_args.css b/theme-compiler/tests/resources/sasslang/css/369-test_mixins_with_empty_args.css
index 234d524066..234d524066 100644
--- a/theme-compiler/tests/resources/sasslangbroken/css/369-test_mixins_with_empty_args.css
+++ b/theme-compiler/tests/resources/sasslang/css/369-test_mixins_with_empty_args.css
diff --git a/theme-compiler/tests/resources/sasslangbroken/scss/369-test_mixins_with_empty_args.scss b/theme-compiler/tests/resources/sasslang/scss/369-test_mixins_with_empty_args.scss
index f608979293..f608979293 100644
--- a/theme-compiler/tests/resources/sasslangbroken/scss/369-test_mixins_with_empty_args.scss
+++ b/theme-compiler/tests/resources/sasslang/scss/369-test_mixins_with_empty_args.scss