Resolve

jamesloi · Jun 6, 2015 · 4fa56cb · 4fa56cb
1 parent c3bde40
commit 4fa56cb
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/tools/nant/NAnt.exe.config b/tools/nant/NAnt.exe.config
@@ -3136,11 +3136,7 @@
               <attribute name="managed">true</attribute>
             </task>
             <task name="csc">
-<<<<<<< HEAD
               <attribute name="exename">${csc.tool}</attribute>
-=======
-              <attribute name="exename">mcs</attribute>
->>>>>>> readonlykernel
               <attribute name="managed">true</attribute>
               <attribute name="langversion">linq</attribute>
               <attribute name="supportspackagereferences">true</attribute>