summaryrefslogtreecommitdiff
path: root/log/build.log
diff options
context:
space:
mode:
authorRanke Johannes <johannes.ranke@agroscope.admin.ch>2024-11-14 08:13:39 +0100
committerRanke Johannes <johannes.ranke@agroscope.admin.ch>2024-11-14 08:13:39 +0100
commit45c9eb16dd317421bf594b7d2aebb11386a9de33 (patch)
tree3c3fba5eea9b0d0b4982a6ff1a564ef6a733d077 /log/build.log
parent172e0dc7af969a9e462f198cd4927e57eba77530 (diff)
Use units in PEC_sw_exposit_drainage. Closes #3
Diffstat (limited to 'log/build.log')
-rw-r--r--log/build.log3
1 files changed, 0 insertions, 3 deletions
diff --git a/log/build.log b/log/build.log
index b92f348..d5832bf 100644
--- a/log/build.log
+++ b/log/build.log
@@ -3,9 +3,6 @@
* checking DESCRIPTION meta-information ... OK
* checking for LF line-endings in source and make files and shell scripts
* checking for empty or unneeded directories
-<<<<<<< HEAD
-=======
* re-saving image files
->>>>>>> main
* building ‘pfm_0.6.3.tar.gz’

Contact - Imprint