Second try at the merge conflicts

vanmooylipidomics · Aug 30, 2021 · 5d857f1 · 5d857f1
1 parent d377f9f
commit 5d857f1
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/inst/NEWS b/inst/NEWS
@@ -1,7 +1,5 @@
-<<<<<<< HEAD
 1.0.0 (2016-04-21)  jrcollins <[email protected]>
   * Initial release for Bioconductor
 1.5.1 (2017-04-11)  jrcollins <[email protected]>
   * added trimmed_database
-  * added doLOBscreen check for physically unlikely oxidated molecules
->>>>>>> upstream/master
+  * added doLOBscreen check for physically unlikely oxidated molecules