From db0939176d994ac65d9c3c726da01cfbff7af3bb Mon Sep 17 00:00:00 2001
From: h-v-smacker <hans-von-smacker+github@gmail.com>
Date: Sun, 21 Jan 2018 22:51:54 +0300
Subject: merging with revamped upstream

---
 depends.txt | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'depends.txt')

diff --git a/depends.txt b/depends.txt
index af2d4c5..b39fd0d 100644
--- a/depends.txt
+++ b/depends.txt
@@ -1,8 +1,4 @@
 default
 intllib?
 lucky_block?
-<<<<<<< HEAD
 pipeworks?
-=======
-pipeworks?
->>>>>>> upstream/master
-- 
cgit v1.2.3