Commit 30a1114b authored by Oscar Scholten's avatar Oscar Scholten

Merge branch 'bugfix/CMS-9921' into 'master'

CMS-9921: merge to master

See merge request !1
parents c45a1986 db7267c8
* Copyright 2014-2015 Hippo B.V. (
* Copyright 2014-2016 Hippo B.V. (
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -23,7 +23,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
......@@ -67,7 +66,7 @@ public class AbstractWatcherIT {
FileUtils.copyDirectory(testBundleFixture, testBundleDir);
emptyDir = new File(testBundleDir, "empty");
cssDir = new File(testBundleDir, "css");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment