From ca2edf6c0abc94b665e3d3055c85f13d7a4f5983 Mon Sep 17 00:00:00 2001
From: Ernest Guevarra <ernest.guevarra@post.harvard.edu>
Date: Thu, 17 Oct 2019 15:10:14 +0100
Subject: [PATCH] update .Rproj file

---
 zscorer.Rproj | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/zscorer.Rproj b/zscorer.Rproj
index db02740..d596992 100644
--- a/zscorer.Rproj
+++ b/zscorer.Rproj
@@ -9,17 +9,9 @@ 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
 
@@ -27,4 +19,3 @@ BuildType: Package
 PackageUseDevtools: Yes
 PackageInstallArgs: --no-multiarch --with-keep.source
 PackageCheckArgs: --as-cran
->>>>>>> 7448699573bfdcb1d3f999bf7b983a3cf8e84310