Browse code

Fixed conflicts in version change

Simone authored on 18/09/2018 16:00:05
Showing1 changed files

... ...
@@ -1,11 +1,7 @@
1 1
 Package: RGMQL
2 2
 Type: Package
3 3
 Title: GenoMetric Query Language for R/Bioconductor
4
-<<<<<<< HEAD
5
-Version: 1.0.1
6
-=======
7 4
 Version: 1.1.0
8
->>>>>>> upstream/master
9 5
 Author: Simone Pallotta, Marco Masseroli
10 6
 Maintainer: Simone Pallotta <simonepallotta@hotmail.com>
11 7
 Description: This package brings the GenoMetric Query Language (GMQL)