Permalink
Browse files

Merge branch 'preprocessor-pipeline' of github.com:AlexCuse/SquishIt …

…into preprocessor-pipeline

Conflicts:
	SquishIt.Framework/Resolvers/EmbeddedResourceResolver.cs
	SquishIt.Framework/Resolvers/HttpResolver.cs
	SquishIt.Tests/FileSystemResolverTests.cs
	SquishIt.Tests/Stubs/StubResolver.cs
  • Loading branch information...
2 parents df94bb8 + e2b368e commit eaef9094e431724725bf4c0440a8c0c8fa37ce25 @AlexCuse committed Apr 9, 2012
@@ -32,7 +32,7 @@ public string TryResolve(string file)
}
}
- public IEnumerable<string> TryResolveFolder(string path, bool recursive, IEnumerable<string> allowedExtensions, IEnumerable<string> disallowedFileExtensions)
+ public IEnumerable<string> TryResolveFolder(string path, bool recursive, IEnumerable<string> allowedExtensions, IEnumerable<string> disallowedExtensions)
{
throw new NotImplementedException("Adding entire directories only supported by FileSystemResolver.");
}
@@ -32,8 +32,7 @@ public string TryResolve(string file)
}
}
- public IEnumerable<string> TryResolveFolder(string path, bool recursive, IEnumerable<string> allowedExtensions, IEnumerable<string> disallowedFileExtensions)
- {
+ public IEnumerable<string> TryResolveFolder(string path, bool recursive, IEnumerable<string> allowedExtensions, IEnumerable<string> disallowedExtensions) {
throw new NotImplementedException("Adding entire directories only supported by FileSystemResolver.");
}

0 comments on commit eaef909

Please sign in to comment.