summaryrefslogtreecommitdiff
path: root/log/build.log
diff options
context:
space:
mode:
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