Merge pull request #79 from nutriverse/v0.3.1.9000

update .Rproj file
nutriverse · Oct 17, 2019 · bc65299 · bc65299
2 parents e234b16 + ca2edf6
commit bc65299
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/zscorer.Rproj b/zscorer.Rproj
@@ -9,22 +9,13 @@ UseSpacesForTab: Yes
 NumSpacesForTab: 2
 Encoding: UTF-8
 
-<<<<<<< HEAD
 RnwWeave: Sweave
 LaTeX: pdfLaTeX
 
-BuildType: Package
-PackageUseDevtools: Yes
-PackageInstallArgs: --no-multiarch --with-keep.source
-=======
-RnwWeave: knitr
-LaTeX: pdfLaTeX
-
 AutoAppendNewline: Yes
 StripTrailingWhitespace: Yes
 
 BuildType: Package
 PackageUseDevtools: Yes
 PackageInstallArgs: --no-multiarch --with-keep.source
 PackageCheckArgs: --as-cran
->>>>>>> 7448699573bfdcb1d3f999bf7b983a3cf8e84310