From 42afbbaaa48a4a1ed37c8694753a1759a03a5252 Mon Sep 17 00:00:00 2001
From: Andrew Jorgensen <ajorgensen@novell.com>
Date: Thu, 20 Jan 2011 11:24:24 -0700
Subject: [PATCH] remove conflict marker

---
 mcs/class/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index f3e74fb2b54..4895c03a95b 100644
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -165,7 +165,6 @@ net_4_0_dirs := \
 	System.Runtime.DurableInstancing \
 	Mono.CodeContracts \
 	Microsoft.Web.Infrastructure
->>>>>>> c372ab7... [asp.net] Added the Microsoft.Web.Infrastructure assembly
 
 net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs)
 moonlight_raw_SUBDIRS := $(moonlight_dirs)
-- 
2.11.4.GIT