@@ -1,6 +1,6 @@

 2019-05-02  Steffen Neumann  <sneumann@msbi-corei>

-	* Rdisop-1.44.1: Merge fix by Max Helf for improved

+	* Rdisop-1.45.1: Merge fix by Max Helf for improved

 	decomposeMass: element filter handling.

 2019-04-01  Steffen Neumann  <sneumann@msbi-corei>

@@ -1,12 +1,7 @@

 Package: Rdisop

 Title: Decomposition of Isotopic Patterns

-<<<<<<< Updated upstream

-Version: 1.45.0

-Date: 2019-04-23

-=======

-Version: 1.44.1

+Version: 1.45.1

 Date: 2019-05-02

->>>>>>> Stashed changes

 Author: Anton Pervukhin <apervukh@minet.uni-jena.de>, Steffen Neumann <sneumann@ipb-halle.de> 

 Maintainer: Steffen Neumann <sneumann@ipb-halle.de>

 Description: Identification of metabolites using high precision mass