The version checked into the tree is a snapshot of an unifinished applet, and
you just made lots of ">>>>>>> mine" lines show up in my working copy of this. Please don't do that again.
This commit is contained in:
parent
eb84a42fdd
commit
4ef6f647a3