summaryrefslogtreecommitdiff
path: root/lib/Input.cc
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Input.cc')
-rw-r--r--lib/Input.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/Input.cc b/lib/Input.cc
index e92f74d..9697913 100644
--- a/lib/Input.cc
+++ b/lib/Input.cc
@@ -419,4 +419,3 @@ Archive::FileTree * Archive::FileTree::Next() {
Archive::FileTree * Archive::FileTree::Prev() {
return prev;
}
->>>>>>> 1.24