# HG changeset patch
# User Ethan Zonca <ez@ethanzonca.com>
# Date 2015-03-16 22:41:52
# Node ID 9a01d6c921f2696d4b78a182754db5ce6393a5cf
# Parent  524f18cc4f835e940990afdfb0bf698070c86761

Merge?

diff --git a/habboard/.directory b/habboard/.directory
--- a/habboard/.directory
+++ b/habboard/.directory
@@ -1,4 +0,0 @@
-[Dolphin]
-Timestamp=2015,2,14,20,28,1
-Version=3
-ViewMode=1