epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove rebase cruft.

Browse Source
This commit is contained in:
Paul Chote
2013-07-21 20:41:04 +12:00
parent 0594822078
commit cff5b8bfb0
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Mods.Cnc/Missions/Nod01Script.cs
View File

@@ -5,7 +5,6 @@
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
* see COPYING. * see COPYING.
<<<<<<< HEAD
*/ */
#endregion #endregion