[Jython-checkins] SF.net SVN: jython: [3416] trunk/jython/src/templates/long.expose

[<otm...@us...>]

Revision: 3416
          http://jython.svn.sourceforge.net/jython/?rev=3416&view=rev
Author:   otmarhumbel
Date:     2007-08-13 23:42:06 -0700 (Mon, 13 Aug 2007)

Log Message:
-----------
Applying patch #1773645 from pjenvey: remove conflict markers from long.expose

Modified Paths:
--------------
    trunk/jython/src/templates/long.expose

Modified: trunk/jython/src/templates/long.expose
===================================================================
--- trunk/jython/src/templates/long.expose	2007-08-14 05:18:58 UTC (rev 3415)
+++ trunk/jython/src/templates/long.expose	2007-08-14 06:42:06 UTC (rev 3416)
@@ -23,8 +23,5 @@
   return Py.newInteger(((`typ)self).long_hashCode());
 # TODO
 # (__coerce__, __doc__)
-<<<<<<< .working
 #
 # (( __rand__, __rdivmod__, __rlshift__,  __ror__, __rrshift__, __rxor__, __rpow__ ))
-=======
->>>>>>> .merge-right.r3159


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.