DokuWiki

It's better when it's simple

User Tools

Site Tools


plugin:conflictmerger

Old Revisions

These are the older revisons of the current document. To revert to an old revision, select it from below, click Edit this page and save it.

  • 2018-10-07 04:41 plugin:conflictmerger shintak +22 B (current)
  • 2018-05-30 00:09 Show differences to current revisions plugin:conflictmerger [Download and Installation] Klap-in -22 B
  • 2016-01-13 14:42 Show differences to current revisions plugin:conflictmerger Aleksandr
  • 2015-03-19 05:58 Show differences to current revisions plugin:conflictmerger 37.200.79.25
  • 2014-10-28 20:04 Show differences to current revisions plugin:conflictmerger Update the "Compatible" information after successfully running the acceptance tests in the 2014-09-29a release 81.9.131.53
  • 2014-10-25 17:01 Show differences to current revisions plugin:conflictmerger [conflictmerger plugin] goldseed
  • 2014-05-17 14:32 Show differences to current revisions plugin:conflictmerger [conflictmerger plugin] Update the "Compatible" information after successfully running the acceptance tests in the 2014-05-05 release 81.9.131.130
  • 2014-05-17 14:30 Show differences to current revisions plugin:conflictmerger [Disabling DokuWiki lock system] As said before in the same section, the patch is only needed for versions older than 2010-02-16; Binky is newer, so there is no need to state again that the patch is no longer necessary in that version 81.9.131.130
  • 2014-03-12 16:17 Show differences to current revisions plugin:conflictmerger [Disabling DokuWiki lock system] goldseed
  • 2014-03-12 16:16 Show differences to current revisions plugin:conflictmerger [Disabling DokuWiki lock system] goldseed
  • 2014-03-12 16:15 Show differences to current revisions plugin:conflictmerger [Disabling DokuWiki lock system] goldseed
  • 2014-02-16 20:03 Show differences to current revisions plugin:conflictmerger Update the "Compatible" information after successfully running the acceptance tests in the 2013-12-08 release 81.9.129.111
  • 2013-07-10 23:11 Show differences to current revisions plugin:conflictmerger Update the "Compatible" information after successfully running the acceptance tests in the 2013-05-10a release 81.9.131.228
  • 2012-11-04 21:49 Show differences to current revisions plugin:conflictmerger Update the "Compatible" information and the "Information for developers" section for the 2012-10-13 release 81.9.131.219
  • 2012-05-01 14:53 Show differences to current revisions plugin:conflictmerger [conflictmerger plugin] Update the "Compatible" information after successfully running the acceptance tests in those versions 81.9.131.116
  • 2012-05-01 14:48 Show differences to current revisions plugin:conflictmerger [Information for developers] Add more information about the tests 81.9.131.116
  • 2011-01-13 15:02 Show differences to current revisions plugin:conflictmerger [Configuration] 77.34.183.27
  • 2010-02-18 04:02 Show differences to current revisions plugin:conflictmerger Updated information about disabling DokuWiki lock system 81.9.131.96
  • 2010-02-07 21:00 Show differences to current revisions plugin:conflictmerger Conflictmerger plugin page created 81.9.131.191
plugin/conflictmerger.txt · Last modified: 2018-10-07 04:41 by shintak