[asterisk-commits] russell: branch russell/events r121497 - /team/russell/events/include/asterisk/

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Jun 10 08:38:37 2008
New Revision: 121497

URL: http://svn.digium.com/view/asterisk?view=rev&rev=121497
Log:
remove a silly line

Modified:
    team/russell/events/include/asterisk/astobj2.h

Modified: team/russell/events/include/asterisk/astobj2.h
URL: http://svn.digium.com/view/asterisk/team/russell/events/include/asterisk/astobj2.h?view=diff&rev=121497&r1=121496&r2=121497
==============================================================================
--- team/russell/events/include/asterisk/astobj2.h (original)
+++ team/russell/events/include/asterisk/astobj2.h Tue Jun 10 08:38:37 2008
@@ -417,7 +417,6 @@
 
 /*! \brief
  * Reference/unreference an object and return the old refcount.
->>>>>>> .merge-right.r114456
  *
  * \param o A pointer to the object
  * \param delta Value to add to the reference counter.