From b470e7b40fb38fb88d428d13cfd96847c965384e Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Thu, 22 Oct 2009 13:15:43 +0200
Subject: [PATCH] Fixup merge artifact.

---
 src/detect.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/detect.c b/src/detect.c
index eca9e6f59e..253ea63abc 100644
--- a/src/detect.c
+++ b/src/detect.c
@@ -2594,11 +2594,8 @@ void SigTableSetup(void) {
     DetectDecodeEventRegister();
     DetectIpOptsRegister();
     DetectFlagsRegister();
-<<<<<<< HEAD:src/detect.c
     DetectFragBitsRegister();
-=======
     DetectGidRegister();
->>>>>>> Gid Keyword:src/detect.c
     DetectCsumRegister();
     DetectStreamSizeRegister();