fix David's merge conflict
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75673 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/MSIL/MSILWriter.h b/lib/Target/MSIL/MSILWriter.h
index cbb2d31..f1b6a69 100644
--- a/lib/Target/MSIL/MSILWriter.h
+++ b/lib/Target/MSIL/MSILWriter.h
@@ -85,15 +85,11 @@
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;
}