1 files changed, 0 insertions, 4 deletions
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