Fixup merge artifact.

16 years ago · b470e7b40f
parent 15a8f34d36
commit b470e7b40f
1 changed files with 0 additions and 3 deletions
--- 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();