Re: bad lines in common.php
| From: | Tomas V.V.Cox | Date: | Tue, 11 Dec 2001 12:58:50 +0000 |
| Subject: | Re: bad lines in common.php | ||
| References: | 1 | Groups: | php.pear.dev |
| Request: | Send a blank email to pear-dev+get-3449@lists.php.net to get a copy of this message | ||
Martin Jansen wrote:
>
> On Thu, 11 Dec 2008 12:06:49 +0300, Denis Peplin wrote:
>
> >What mean this lines in
> >DB/common.php:
> >
> ><<<<<<< common.php
> >=======
> >// $Id: common.php,v 1.72 2001/11/28 14:17:54 cox Exp $
> >//
> >>>>>>>> 1.72
>
> It was a conflict in the revision control system (CVS). Acutally
> it seems to be fixed in the latest CVS version.
>
I guess that was Denis who introduced this CVS conflict in his copy, not
us.
Tomas V.V.Cox