From 3d92f041f30e107f212d416f94e33743a85dd273 Mon Sep 17 00:00:00 2001
From: Mauricio Carneiro <carneiro@broadinstitute.org>
Date: Mon, 23 Jul 2012 17:35:07 -0400
Subject: [PATCH] forgot to delete the merging line

---
 .../src/org/broadinstitute/sting/utils/help/GATKDoclet.java  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/public/java/src/org/broadinstitute/sting/utils/help/GATKDoclet.java b/public/java/src/org/broadinstitute/sting/utils/help/GATKDoclet.java
index 28bf2e158..d14d95e60 100644
--- a/public/java/src/org/broadinstitute/sting/utils/help/GATKDoclet.java
+++ b/public/java/src/org/broadinstitute/sting/utils/help/GATKDoclet.java
@@ -45,12 +45,9 @@ import org.broadinstitute.sting.utils.text.XReadLines;
 
 import java.io.*;
 import java.lang.annotation.Annotation;
-<<<<<<< HEAD
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
-=======
->>>>>>> Added the ability to update the Forum
 import java.util.*;
 
 /**
@@ -576,4 +573,4 @@ public class GATKDoclet {
 
         return parts[0];
     }
-}
\ No newline at end of file
+}