diff options
author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-03-17 23:57:03 +0000 |
---|---|---|
committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-03-17 23:57:03 +0000 |
commit | 26213f8ee443addfbc74e92a693e172d023b16e6 (patch) | |
tree | b034bfda2dc1ff04a7a5669f4c1a8d8747629915 /debian | |
parent | 50a9ef47538666c565c26ad7125a9e6484330cfd (diff) | |
download | ikiwiki-26213f8ee443addfbc74e92a693e172d023b16e6.tar ikiwiki-26213f8ee443addfbc74e92a693e172d023b16e6.tar.gz |
* Detect the case of two people independently creating the same page at the
same time, and let the second person resolve the conflict.
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index ee860a08e..d76e05d77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,10 @@ ikiwiki (1.46) UNRELEASED; urgency=low with the same name already exists, and generally simplify the edit code. * Make ikiwiki -verbose -setup with a setup file that enabled syslog logging output the verbose build log to stdout, rather than to the syslog. + * Detect the case of two people independently creating the same page at the + same time, and let the second person resolve the conflict. - -- Joey Hess <joeyh@debian.org> Sat, 17 Mar 2007 19:31:31 -0400 + -- Joey Hess <joeyh@debian.org> Sat, 17 Mar 2007 19:56:04 -0400 ikiwiki (1.45) unstable; urgency=low |