From f42661df57ae69bd96c778c00ab7af0314b528e5 Mon Sep 17 00:00:00 2001
From: THEERTHA KARIYATHAN <tkariyat@bscearth421.int.bsc.es>
Date: Fri, 7 Feb 2025 12:11:18 +0100
Subject: [PATCH] rm  Rproj & update gitignore

---
 .gitignore    |  6 +-----
 cstools.Rproj | 17 -----------------
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 cstools.Rproj

diff --git a/.gitignore b/.gitignore
index b2d7bbf9..258f9ef9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,9 +17,5 @@ Rplots.pdf
 .nfs*
 *.RData
 !data/*.RData
-<<<<<<< HEAD
-.Rproj.user/
-
-=======
 .Rproj.user
->>>>>>> d82bd2503734b41ca8f7bdd66deb934c3b202f03
+*.Rproj
diff --git a/cstools.Rproj b/cstools.Rproj
deleted file mode 100644
index 21a4da08..00000000
--- a/cstools.Rproj
+++ /dev/null
@@ -1,17 +0,0 @@
-Version: 1.0
-
-RestoreWorkspace: Default
-SaveWorkspace: Default
-AlwaysSaveHistory: Default
-
-EnableCodeIndexing: Yes
-UseSpacesForTab: Yes
-NumSpacesForTab: 2
-Encoding: UTF-8
-
-RnwWeave: Sweave
-LaTeX: pdfLaTeX
-
-BuildType: Package
-PackageUseDevtools: Yes
-PackageInstallArgs: --no-multiarch --with-keep.source
-- 
GitLab