From 0bd733d7a08cb7f2a2dee8dd8ce6abdc5f4d8df0 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Mon, 7 Feb 2011 20:10:52 +1300
Subject: [PATCH] Fix bogus rebase

---
 mods/ra/rules/defaults.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index 9693cbcae1..e8b60eb84d 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -130,7 +130,6 @@
 	DrawLineToTarget:
 	ActorLostNotification:
 		Notification: aunitl1.aud
-<<<<<<< HEAD
 	DebugAircraftFacing:
 	DebugAircraftSubPxX:
 	DebugAircraftSubPxY: