r2627 - trunk/libminisip/include/libminisip/rtp

[werner at minisip.org]

Author: werner
Date: 2006-06-04 13:53:33 +0200 (Sun, 04 Jun 2006)
New Revision: 2627

Modified:
   trunk/libminisip/include/libminisip/rtp/RtpPacket.h
Log:
Arrrg - checked in wrong file version - fixed here.

Modified: trunk/libminisip/include/libminisip/rtp/RtpPacket.h
===================================================================
--- trunk/libminisip/include/libminisip/rtp/RtpPacket.h	2006-06-04 11:42:48 UTC (rev 2626)
+++ trunk/libminisip/include/libminisip/rtp/RtpPacket.h	2006-06-04 11:53:33 UTC (rev 2627)
@@ -1,4 +1,3 @@
-<<<<<<< .mine
 /*
  Copyright (C) 2004-2006 the Minisip Team