From f987b314c9dd3cafa4a6f06e6cff1c5be2b72b59 Mon Sep 17 00:00:00 2001
From: Bruno Wolff III <bruno@wolff.to>
Date: May 14 2014 12:59:19 +0000
Subject: Finish merge of man page fixes


---

diff --git a/sources b/sources
index d7e8076..b8c0d51 100644
--- a/sources
+++ b/sources
@@ -1,8 +1,3 @@
 d92ab59aabf5173f2a59089531e30dbf  squashfs4.3.tar.gz
-<<<<<<< HEAD
-235a2a9f839383a0a15dc7836c1c1693  mksquashfs.1
-ad06b65980fe81bf155e22a67d732607  unsquashfs.1
-=======
 7f834f7e4306737b5d7755a1ed61307d  mksquashfs.1
 68bf9bbf3ba00dc6e480a59b24905185  unsquashfs.1
->>>>>>> f20