Browse code

Fix left-over merge conflict

Steffen Neumann authored on 03/05/2019 06:04:37
Showing2 changed files

... ...
@@ -1,6 +1,6 @@
1 1
 2019-05-02  Steffen Neumann  <sneumann@msbi-corei>
2 2
 
3
-	* Rdisop-1.44.1: Merge fix by Max Helf for improved
3
+	* Rdisop-1.45.1: Merge fix by Max Helf for improved
4 4
 	decomposeMass: element filter handling.
5 5
 
6 6
 2019-04-01  Steffen Neumann  <sneumann@msbi-corei>
... ...
@@ -1,12 +1,7 @@
1 1
 Package: Rdisop
2 2
 Title: Decomposition of Isotopic Patterns
3
-<<<<<<< Updated upstream
4
-Version: 1.45.0
5
-Date: 2019-04-23
6
-=======
7
-Version: 1.44.1
3
+Version: 1.45.1
8 4
 Date: 2019-05-02
9
->>>>>>> Stashed changes
10 5
 Author: Anton Pervukhin <apervukh@minet.uni-jena.de>, Steffen Neumann <sneumann@ipb-halle.de> 
11 6
 Maintainer: Steffen Neumann <sneumann@ipb-halle.de>
12 7
 Description: Identification of metabolites using high precision mass