From 2abec11ad14687c1c717bb9c570e78525c84ee0f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 19 Sep 2024 06:07:41 +0200 Subject: Merging upstream version 3.46.1. Signed-off-by: Daniel Baumann --- www/sessionintro.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'www/sessionintro.html') 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. 

/*
 ** Conflict handler callback used by apply_changeset(). See below.
 */
-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+ is the inverse of changeset C, then
        applying C and then C+ to a database should leave
        the database unchanged.
-

+
This page last modified on  2024-06-01 14:57:22 UTC 

 
-- 
cgit v1.2.3