[Pkg-cli-apps-commits] [fsharp] 54/60: integrate visualfsharp\master (2)

[Christopher Halse Rogers]

This is an automated email from the git hooks/post-receive script.

raof-guest pushed a commit to branch master
in repository fsharp.

commit 48f3c261c425808f0b23d5b789a7ac81d6dfc95e
Author: F# Software Foundation <fsgit at fastmail.fm>
Date:   Tue Sep 2 17:11:27 2014 +0200

    integrate visualfsharp\master (2)
---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 3dca345..8a7f2a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,7 +57,6 @@ tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource/Sample_VS2012
 tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.userprefs
 *.suo
 obj
-<<<<<<< HEAD
 src/fsharp/FSharp.Data.TypeProviders/FSData.resx
 src/fsharp/fsiAnyCpu/FSIstrings.resx
 *.actual

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git