new exploit.rb syntax error in trunk?

[tmaletic at gmail.com (Tim Maletic)]

Is this just me?

$ ruby --version
ruby 1.8.6 (2007-03-13 patchlevel 0) [i686-darwin9.6.0]
$ svn update
At revision 6940.
$ ./msfconsole
/opt/framework-trunk/lib/msf/core.rb:49:in `require':
/opt/framework-trunk/lib/msf/core/exploit.rb:255: syntax error,
unexpected tLSHFT, expecting kEND (SyntaxError)
<<<<<<< .mine
  ^
/opt/framework-trunk/lib/msf/core/exploit.rb:259: syntax error,
unexpected tEQQ, expecting kEND
=======
   ^
/opt/framework-trunk/lib/msf/core/exploit.rb:263: syntax error,
unexpected tRSHFT, expecting kEND
> > > > > > > .r6935
  ^     from /opt/framework-trunk/lib/msf/core.rb:49
        from /opt/framework-trunk/lib/msf/ui/console/driver.rb:1:in `require'
        from /opt/framework-trunk/lib/msf/ui/console/driver.rb:1
        from /opt/framework-trunk/lib/msf/ui/console.rb:10:in `require'
        from /opt/framework-trunk/lib/msf/ui/console.rb:10
        from /opt/framework-trunk/lib/msf/ui.rb:10:in `require'
        from /opt/framework-trunk/lib/msf/ui.rb:10
        from ./msfconsole:16:in `require'
        from ./msfconsole:16