diff --git a/OpenRA.Mods.Cnc/Missions/Nod01Script.cs b/OpenRA.Mods.Cnc/Missions/Nod01Script.cs index 1eb7a1c667..5b6843e19c 100644 --- a/OpenRA.Mods.Cnc/Missions/Nod01Script.cs +++ b/OpenRA.Mods.Cnc/Missions/Nod01Script.cs @@ -5,7 +5,6 @@ * available to you under the terms of the GNU General Public License * as published by the Free Software Foundation. For more information, * see COPYING. -<<<<<<< HEAD */ #endregion