From 662e437561057c27caf4297f7e02c8cbbb1f5685 Mon Sep 17 00:00:00 2001
From: "Daniel J. McDonald" <dajmcdon@gmail.com>
Date: Tue, 5 Nov 2024 15:06:54 -0800
Subject: [PATCH] merge Rproj

---
 tvdenoising.Rproj | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tvdenoising.Rproj b/tvdenoising.Rproj
index ab08bf4..497f8bf 100644
--- a/tvdenoising.Rproj
+++ b/tvdenoising.Rproj
@@ -12,12 +12,9 @@ Encoding: UTF-8
 RnwWeave: Sweave
 LaTeX: pdfLaTeX
 
-<<<<<<< HEAD
 AutoAppendNewline: Yes
 StripTrailingWhitespace: Yes
 
-=======
->>>>>>> 35c4f3474b3c529d53ddde9e5fb86a3e6de9638f
 BuildType: Package
 PackageUseDevtools: Yes
 PackageInstallArgs: --no-multiarch --with-keep.source