Clean up merge

Author: bumbanian

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: isoWater
 Type: Package
 Title: Discovery, Retrieval, and Analysis of Water Isotope Data 
-Version: 1.0.1.9000
+Version: 1.1.0.9000
 Authors@R: person("Gabe", "Bowen", email = "gabe.bowen@utah.edu",
                   role = c("aut", "cre"))
 Maintainer: Gabe Bowen <gabe.bowen@utah.edu>
@@ -25,8 +25,4 @@ VignetteBuilder: knitr
 License: GPL-3
 Language: en-US
 Encoding: UTF-8
-<<<<<<< HEAD
-=======
-RoxygenNote: 7.1.1
 LazyData: true
->>>>>>> e6d52351033c444a64b33464ce03712ac211b21f

NEWS.md

@@ -1,13 +1,12 @@
 # isoWater news
 
-## isoWater 1.0.1.9000
-<<<<<<< HEAD
+## isoWater 1.1.0.9000
 * iso function now checks for and removes data with missing values
 * Bug fixes
-=======
+
+## isoWater 1.1.0
 * Add dex function
 * Bug and spelling fixes
->>>>>>> e6d52351033c444a64b33464ce03712ac211b21f
 
 ## isoWater 1.0.1
 * Bug fixes

R/watercomp.R

@@ -15,12 +15,7 @@ mwlSource = function(obs, MWL = NULL, slope, stype = 1, ngens=1e4, ncores = 1){
   if(MWL[6] == 80672 & stype == 2){
     warning("Using stype=2 and GMWL is inappropriate for most applications; see man")
   }
-<<<<<<< HEAD
-  if(!(inherits(obs, "iso"))){
-=======
-  
   if(!inherits(obs, "iso")){
->>>>>>> e6d52351033c444a64b33464ce03712ac211b21f
     warning("Expecting iso object for obs, this argument may be formatted incorrectly")
   }
   if(!(stype %in% c(1, 2))){
@@ -110,14 +105,9 @@ mwlSource = function(obs, MWL = NULL, slope, stype = 1, ngens=1e4, ncores = 1){
 mixSource = function(obs, sources, slope, prior=rep(1,nrow(sources)), 
                    shp=1, ngens=1e5, ncores = 1){
 
-<<<<<<< HEAD
-  if(!(inherits(obs, "iso"))){
-    warning("Expecting iso object for obs, this argument may be formatted incorrectly")
-=======
   if(!inherits(obs, "iso")){
     warning("Expecting iso object for obs, this argument may be
             formatted incorrectly")
->>>>>>> e6d52351033c444a64b33464ce03712ac211b21f
   }
 
   #get number of observations