svn 44 fails to launch

[GoogleCodeExporter]

** IMPORTANT **
There is a known issue with the 0.15.0 version of the bindings : your
buttons will become irresponsive. When launched from a terminal you'll see
a GRClosure warning that the object is already destroyed and can't have a
callback. Please don't report any more bugs of these kind, but just
downgrade to the 0.14.* version.
** IMPORTANT **

What steps will reproduce the problem?
1. Try to run it :P
2.
3.

What is the expected output? What do you see instead?
[jebediah@manger]-(~/src/rubyripper/svn)$ ./rubyripper_gtk2.rb
./rubyripper_gtk2.rb:10:in `require': ./rr_lib.rb:692: syntax error,
unexpected tLSHFT, expecting kEND (SyntaxError)
<<<<<<< .mine
  ^
./rr_lib.rb:695: syntax error, unexpected tEQQ, expecting kEND
=======
   ^
./rr_lib.rb:697: syntax error, unexpected tRSHFT
>>>>>>> .r43
  ^
./rr_lib.rb:802: syntax error, unexpected $end, expecting kEND  from
./rubyripper_gtk2.rb:10

What version of rubyripper are you using? On what operating system? What is
your version of the ruby-gtk bindings?
svn 44 on Debian.  libgtk2-ruby 0.15.0-1.1

Original issue reported on code.google.com by mordbr...@gmail.com on 28 Dec 2006 at 4:43

[GoogleCodeExporter]

Solved. Subversion actually changed my code when a conflict occured. I didn't 
knew 
that.

Original comment by rubyripp...@gmail.com on 28 Dec 2006 at 5:20

• Changed state: Fixed

[GoogleCodeExporter]

Hehe, learn something new every day :)  It runs now ... time to file more bugs 
<:]

Original comment by mordbr...@gmail.com on 28 Dec 2006 at 8:25

[GoogleCodeExporter]

Well you know there's nothing I enjoy more than seeing new bugs reported :D

Original comment by rubyripp...@gmail.com on 28 Dec 2006 at 5:14