zzh
/
gatk-3.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

forgot to delete the merging line

This commit is contained in:
Mauricio Carneiro 2012-07-23 17:35:07 -04:00
parent f3c504769b
commit 3d92f041f3
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/java/src/org/broadinstitute/sting/utils/help/GATKDoclet.java
View File

@ -45,12 +45,9 @@ import org.broadinstitute.sting.utils.text.XReadLines;
import java.io.*; import java.io.*;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
<<<<<<< HEAD
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
=======
>>>>>>> Added the ability to update the Forum
import java.util.*; import java.util.*;
/** /**
@ -576,4 +573,4 @@ public class GATKDoclet {
return parts[0]; return parts[0];
} }
} }