Permalink
Browse files

Merge branch 'master' into dev-multiple-engines

Conflicts:
	Chirpy/Chirpy.csproj
  • Loading branch information...
andyedinborough committed May 3, 2012
2 parents 5bbe012 + 3cda8e0 commit 04226182fac370b608ffb3d9482d8bade82184ea
Showing with 1 addition and 1 deletion.
  1. BIN .nuget/NuGet.exe
  2. +1 −1 Chirpy/Chirpy.csproj
View
Binary file not shown.
View
@@ -72,7 +72,7 @@
<Compile Include="Engines\JsHintEngine.cs" />
<Compile Include="Engines\CssLintEngine.cs" />
<Compile Include="Composition\DirectoryCatalogWatcher.cs" />
- <Compile Include="Composition\MefComposer.cs" />
+ <Compile Include="Composition\MefComposer.cs" />
<Compile Include="Engines\UglifyEngine.cs" />
<Compile Include="ErrorListProviderWrapper.cs" />
<Compile Include="Exports\MultiEngineResolver.cs" />

0 comments on commit 0422618

Please sign in to comment.