From 5473f07314cef4b93e82405664e49e04c175db80 Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Tue, 14 Jul 2009 20:25:40 +0000
Subject: [PATCH] fix David's merge conflict

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75673 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Target/MSIL/MSILWriter.h | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/Target/MSIL/MSILWriter.h b/lib/Target/MSIL/MSILWriter.h
index cbb2d31e7db..f1b6a696ada 100644
--- a/lib/Target/MSIL/MSILWriter.h
+++ b/lib/Target/MSIL/MSILWriter.h
@@ -85,15 +85,11 @@ namespace {
       StaticInitList;
     const std::set<const Type *>* UsedTypes;
     static char ID;
-<<<<<<< .mine
-    MSILWriter(formatted_raw_ostream &o) : FunctionPass(&ID), Out(o) {
-=======
     DenseMap<const Value*, unsigned> AnonValueNumbers;
     unsigned NextAnonValueNumber;
 
-    MSILWriter(raw_ostream &o)
-       : FunctionPass(&ID), Out(o), NextAnonValueNumber(0) {
->>>>>>> .r75668
+    MSILWriter(formatted_raw_ostream &o) : FunctionPass(&ID), Out(o),
+         NextAnonValueNumber(0) {
       UniqID = 0;
     }