From 45c9eb16dd317421bf594b7d2aebb11386a9de33 Mon Sep 17 00:00:00 2001
From: Ranke Johannes <johannes.ranke@agroscope.admin.ch>
Date: Thu, 14 Nov 2024 08:13:39 +0100
Subject: Use units in PEC_sw_exposit_drainage. Closes #3

---
 log/build.log | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'log/build.log')

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’
 
-- 
cgit v1.2.1