From d20339dc04fd760e087adddbab104223732e2af4 Mon Sep 17 00:00:00 2001
From: Peter Krusche <peter.krusche@novartis.com>
Date: Tue, 9 Apr 2024 13:00:14 +0200
Subject: [PATCH] fix merging issues

---
 .Rprofile                    | 4 ++++
 .nfs00000000c96b82be00002795 | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)
 delete mode 100644 .nfs00000000c96b82be00002795

diff --git a/.Rprofile b/.Rprofile
index 81b960f..842c02d 100644
--- a/.Rprofile
+++ b/.Rprofile
@@ -1 +1,5 @@
 source("renv/activate.R")
+
+if (Sys.getenv("LOAD_MONITOS_PACKAGE") == "true") {
+  devtools::load_all(".")
+}
diff --git a/.nfs00000000c96b82be00002795 b/.nfs00000000c96b82be00002795
deleted file mode 100644
index 81b960f..0000000
--- a/.nfs00000000c96b82be00002795
+++ /dev/null
@@ -1 +0,0 @@
-source("renv/activate.R")