Index: openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl	19 Jan 2018 21:23:51 -0000	1.4
+++ openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl	3 Sep 2024 15:37:33 -0000	1.5
@@ -4,9 +4,9 @@
 
     @author Peter Marklund
 } {
-    package_key
+    package_key:token
     message_key
-    locale
+    locale:word
     {return_url:localurl {[export_vars -base "message-conflicts" { package_key locale }]}}
 }