[dokuwiki] Re: problem after patching via darcs plugin

  • From: Andreas Gohr <andi@xxxxxxxxxxxxxx>
  • To: dokuwiki@xxxxxxxxxxxxx
  • Date: Wed, 12 Jul 2006 13:51:00 +0200

Hi!

I just used the darcs plugin to update my installation. Something went
wrong, in inc/template.php I read:

- ---snip---
v v v v v v v
  trigger_event('TPL_CONTENT_DISPLAY',$html_output,'ptln');
*************
  trigger_event('TPL_CONTENT_DISPLAY',$html_output,ptln);

  return $html_output;
^ ^ ^ ^ ^ ^ ^
- ---pins---

Someone please put me on the right track? TIA!

There was a conflict on applying. To resolve simply delete the affected file:

$> rm -f inc/template.php

then restore the file from the repository:

$> darcs revert inc/template.php


Andi
--
DokuWiki mailing list - more info at
http://wiki.splitbrain.org/wiki:mailinglist

Other related posts:

  1. Home
  2. dokuwiki
  3. Archive
  4. 07-2006