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

Fixed error in Sandbox.java

This commit is contained in:
Karthik Gururaj 2014-03-05 09:36:55 -08:00
parent 8fcbf9272c
commit ec54528605
1 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
public/VectorPairHMM/src/main/c++/Sandbox.java
View File

@ -1,29 +1,3 @@
<<<<<<< HEAD
/*Copyright (c) 2012 The Broad Institute
*Permission is hereby granted, free of charge, to any person
*obtaining a copy of this software and associated documentation
*files (the "Software"), to deal in the Software without
*restriction, including without limitation the rights to use,
*copy, modify, merge, publish, distribute, sublicense, and/or sell
*copies of the Software, and to permit persons to whom the
*Software is furnished to do so, subject to the following
*conditions:
*The above copyright notice and this permission notice shall be
*included in all copies or substantial portions of the Software.
*THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
*EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
*OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
*NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
*HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
*WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
*FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
*THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
=======
/* /*
* Copyright (c) 2012 The Broad Institute * Copyright (c) 2012 The Broad Institute
* *
@ -50,7 +24,6 @@
*/ */
package org.broadinstitute.sting.utils.vectorpairhmm; package org.broadinstitute.sting.utils.vectorpairhmm;
>>>>>>> 6fe5a4ae409445ff53786af0de07c5f7047052ea
import java.util.List; import java.util.List;
import java.util.LinkedList; import java.util.LinkedList;