From fc982539888122cb4cceb63cb247a8ae750ad2a4 Mon Sep 17 00:00:00 2001
From: Marco De Lucia <delucia@gfz-potsdam.de>
Date: Thu, 13 Jun 2024 12:27:34 +0200
Subject: [PATCH] fix: removed Time-stamp lines from README and CMake/ Solve
 conflict

---
 CMake/FindRRuntime.cmake | 1 -
 README.md                | 8 --------
 2 files changed, 9 deletions(-)

diff --git a/CMake/FindRRuntime.cmake b/CMake/FindRRuntime.cmake
index 883f84589..8dd4de83c 100644
--- a/CMake/FindRRuntime.cmake
+++ b/CMake/FindRRuntime.cmake
@@ -1,4 +1,3 @@
-## Time-stamp: "Last modified 2024-06-13 10:25:44 delucia"
 # prepare R environment (Rcpp + RInside)
 find_program(R_EXE "R")
 
diff --git a/README.md b/README.md
index c192eda8a..616eac8c6 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,3 @@
-<!--
-<<<<<<< HEAD
-    Time-stamp: "Last modified 2024-09-12 11:39:28 delucia"
-=======
-    Time-stamp: "Last modified 2024-06-13 09:43:22 delucia"
->>>>>>> 9272556 (Fixes in README and poet.cpp)
--->
-
 # POET
 
 [POET](https://doi.org/10.5281/zenodo.4757913) is a coupled reactive