diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-03 05:16:44 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-03 05:16:44 +0000 |
commit | 62a67b10ff9f9eea6a4695649fb8252d2a4bc74d (patch) | |
tree | 7b54cadc082d323cda5fd24248e85b7d2ea664a3 /www/sessionintro.html | |
parent | Adding debian version 3.45.3-1. (diff) | |
download | sqlite3-62a67b10ff9f9eea6a4695649fb8252d2a4bc74d.tar.xz sqlite3-62a67b10ff9f9eea6a4695649fb8252d2a4bc74d.zip |
Merging upstream version 3.46.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'www/sessionintro.html')
-rw-r--r-- | www/sessionintro.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/www/sessionintro.html b/www/sessionintro.html index 7349cff..efde36f 100644 --- a/www/sessionintro.html +++ b/www/sessionintro.html @@ -518,7 +518,7 @@ static int xConflict(void *pCtx, int eConflict, sqlite3_changset_iter *pIter){ ** ** If parameter bIgnoreConflicts is true, then any conflicting changes ** within the changeset are simply ignored. Or, if bIgnoreConflicts is -** false, then this call fails with an SQLTIE_ABORT error if a changeset +** false, then this call fails with an SQLITE_ABORT error if a changeset ** conflict is encountered. */</i> int apply_changeset( |