max/poet
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/poet.git synced 2025-12-16 12:54:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: removed Time-stamp lines from README and CMake/

Browse Source 
Solve conflict
This commit is contained in:
Marco De Lucia 2024-06-13 12:27:34 +02:00
parent 80fc755ceb
commit fc98253988
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMake/FindRRuntime.cmake
View File

@ -1,4 +1,3 @@
## Time-stamp: "Last modified 2024-06-13 10:25:44 delucia"
# prepare R environment (Rcpp + RInside) # prepare R environment (Rcpp + RInside)
find_program(R_EXE "R") find_program(R_EXE "R")

8
README.md
View File

@ -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
[POET](https://doi.org/10.5281/zenodo.4757913) is a coupled reactive [POET](https://doi.org/10.5281/zenodo.4757913) is a coupled reactive