The version checked into the tree is a snapshot of an unifinished applet, and

Browse source

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:

Rob Landley 2006-09-20 21:57:36 +00:00

parent eb84a42fdd

commit 4ef6f647a3

1 changed files with 7 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files