Permalink
Browse files

Fixed csproj and updated git attributes.

  • Loading branch information...
davidfowl committed Nov 21, 2012
1 parent 176e0ac commit 90c46d006266908b5c80addc2fea47a37e908683
View
@@ -42,8 +42,8 @@
*.fsx text=auto
*.hs text=auto
-*.csproj text=auto merge=union
-*.vbproj text=auto merge=union
-*.fsproj text=auto merge=union
-*.dbproj text=auto merge=union
-*.sln text=auto eol=crlf merge=union
+*.csproj text=auto
+*.vbproj text=auto
+*.fsproj text=auto
+*.dbproj text=auto
+*.sln text=auto eol=crlf
@@ -53,9 +53,6 @@
<Project>{EB46B9C6-EE37-48F9-835E-E49580E40E0A}</Project>
<Name>Microsoft.AspNet.SignalR.Client</Name>
</ProjectReference>
- <ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Hosting.Common\Microsoft.AspNet.SignalR.Hosting.Common.csproj">
- <Project>{3B71F0AE-D4B6-4F47-BF62-333D45615673}</Project>
- <Name>Microsoft.AspNet.SignalR.Hosting.Common</Name>
<ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Hosting.Memory\Microsoft.AspNet.SignalR.Hosting.Memory.csproj">
<Project>{055F2118-FE29-4219-A28A-3D6F0889652E}</Project>
<Name>Microsoft.AspNet.SignalR.Hosting.Memory</Name>

0 comments on commit 90c46d0

Please sign in to comment.