Browse code

fixed url

Simone authored on 23/08/2018 06:43:54
Showing1 changed files

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