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

Fix bogus rebase

Browse Source
This commit is contained in:
Paul Chote
2011-02-07 20:10:52 +13:00
parent 23c0524738
commit 0bd733d7a0
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mods/ra/rules/defaults.yaml
View File

@@ -130,7 +130,6 @@
DrawLineToTarget: DrawLineToTarget:
ActorLostNotification: ActorLostNotification:
Notification: aunitl1.aud Notification: aunitl1.aud
<<<<<<< HEAD
DebugAircraftFacing: DebugAircraftFacing:
DebugAircraftSubPxX: DebugAircraftSubPxX:
DebugAircraftSubPxY: DebugAircraftSubPxY: