From: greena1re <alexandergreen22@gmail.com>
Date: Thu, 27 Feb 2014 10:39:34 +0000 (-0800)
Subject: deleted weird remnants of merge but still broken
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=4a6fef0116ebcb73dc3b2bffd87225bab8bd693d;hp=4a6fef0116ebcb73dc3b2bffd87225bab8bd693d;p=SugarCubes.git

deleted weird remnants of merge but still broken
---