fixed unresolved merge notes

lwjohnst86 · lwjohnst86 · commit 7869ca31ec89 · 2018-07-22T10:35:08.000+02:00
diff --git a/studyGroup.Rproj b/studyGroup.Rproj
@@ -14,10 +14,6 @@ LaTeX: pdfLaTeX
 
 AutoAppendNewline: Yes
 StripTrailingWhitespace: Yes
-<<<<<<< HEAD
 
-BuildType: Package
-PackageUseDevtools: Yes
-PackageInstallArgs: --no-multiarch --with-keep.source
-=======
->>>>>>> b7b5624683f65ec097a071ae9566cb3849fa7517
+BuildType: Custom
+CustomScriptPath: scripts/announcements.R
