From f1c4f89f12d94059e0cf79c6ea4bf0f7e7c2e366 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Fri, 26 Oct 2012 03:03:58 +0000
Subject: [PATCH 1/1] Remove extraneous file from proj

---
 msi/WiX/MergeModules/MergeModules.vcxproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/msi/WiX/MergeModules/MergeModules.vcxproj b/msi/WiX/MergeModules/MergeModules.vcxproj
index e219853..ef9ee54 100644
--- a/msi/WiX/MergeModules/MergeModules.vcxproj
+++ b/msi/WiX/MergeModules/MergeModules.vcxproj
@@ -73,7 +73,6 @@ del OpenSAML-schemas.msm</NMakeCleanCommandLine>
   <ItemGroup>
     <None Include="Curl-x64.wxs" />
     <None Include="Curl-x86.wxs" />
-    <None Include="Curl.vcxproj.user" />
     <None Include="FastCGI-x86.wxs" />
     <None Include="FastCGI-x64.wxs" />
     <None Include="MergeModules.make" />
-- 
2.1.4