summaryrefslogtreecommitdiffstats
path: root/www/sessionintro.html
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:07:41 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:07:41 +0000
commit2abec11ad14687c1c717bb9c570e78525c84ee0f (patch)
treed15af7ac53ab21adc710992e03486cf99ddb626f /www/sessionintro.html
parentAdding debian version 3.46.0-1. (diff)
downloadsqlite3-2abec11ad14687c1c717bb9c570e78525c84ee0f.tar.xz
sqlite3-2abec11ad14687c1c717bb9c570e78525c84ee0f.zip
Merging upstream version 3.46.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'www/sessionintro.html')
-rw-r--r--www/sessionintro.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/www/sessionintro.html b/www/sessionintro.html
index efde36f..f16fa1f 100644
--- a/www/sessionintro.html
+++ b/www/sessionintro.html
@@ -505,7 +505,7 @@ above for details.
</p><div class="codeblock"><pre><i>/*
** Conflict handler callback used by apply_changeset(). See below.
*/</i>
-static int xConflict(void *pCtx, int eConflict, sqlite3_changset_iter *pIter){
+static int xConflict(void *pCtx, int eConflict, sqlite3_changeset_iter *pIter){
int ret = (int)pCtx;
return ret;
}
@@ -647,5 +647,5 @@ available for the use and manipulation of changeset and patchset blobs:
original. If changeset C<sup>+</sup> is the inverse of changeset C, then
applying C and then C<sup>+</sup> to a database should leave
the database unchanged.
-</p></li></ul>
+</p></li></ul><p align="center"><small><i>This page last modified on <a href="https://sqlite.org/docsrc/honeypot" id="mtimelink" data-href="https://sqlite.org/docsrc/finfo/pages/sessionintro.in?m=20ce2b0e76">2024-06-01 14:57:22</a> UTC </small></i></p>