Fixed csproj and updated git attributes.

SignalR · Nov 21, 2012 · 90c46d0 · 90c46d0
1 parent 176e0ac
commit 90c46d0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -42,8 +42,8 @@
 *.fsx text=auto
 *.hs text=auto
 
-*.csproj text=auto merge=union 
+*.csproj text=auto
-*.vbproj text=auto merge=union 
+*.vbproj text=auto
-*.fsproj text=auto merge=union 
+*.fsproj text=auto
-*.dbproj text=auto merge=union 
+*.dbproj text=auto
-*.sln text=auto eol=crlf merge=union 
+*.sln text=auto eol=crlf
diff --git a/...es/Microsoft.AspNet.SignalR.Client.Samples/Microsoft.AspNet.SignalR.Client.Samples.csproj b/...es/Microsoft.AspNet.SignalR.Client.Samples/Microsoft.AspNet.SignalR.Client.Samples.csproj
@@ -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>