From 1626831cc85307682610e58f4bca2a4b7c583024 Mon Sep 17 00:00:00 2001 From: joey Date: Wed, 15 Nov 2006 20:49:10 +0000 Subject: [PATCH] typos --- templates/editpage.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index ad1faa3a5..f63a4b089 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -14,11 +14,11 @@

-Your changes confict with other changes made to the page. +Your changes conflict with other changes made to the page.

Conflict markers have been inserted into the page content. Reconcile the -confict and commit again to save your changes. +conflict and commit again to save your changes.

-- 2.44.0