@@ -2,7 +2,11 @@ Package: EventPointer

 Type: Package

 Title: An effective identification of alternative splicing events

 	   using junction arrays and RNA-Seq data

+<<<<<<< HEAD

 Version: 2.2.1

+=======

+Version: 2.3.2

+>>>>>>> 7cf55d8... Bug Fix: Error in unitTests FindPrimers

 Author: Juan Pablo Romero, Juan A. Ferrer-Bonsoms, Pablo Sacristan, Ander Muniategui, Fernando Carazo, Ander Aramburu, Angel Rubio

 Maintainer: Juan Pablo Romero <jpromero@ceit.es>

 Description: EventPointer is an R package to identify alternative splicing events 

@@ -15,8 +15,6 @@ test_FindPrimers <- function() {

   checkIdentical("SG field is empty", obs)

-

-

   obs <- tryCatch(

     FindPrimers(SG = list(),

                 EventNum = 0,