Allow 'conflict' as an alias for 'conflict_strategy'

diff --git a/bucardo b/bucardo
index 010aed3292c040aa9af9e0430e075c9c5fb788eb..6ed4f206deaf22bd469c833714e073d1fa9d1e74 100755 (executable)
--- a/bucardo
+++ b/bucardo
@@ -4064,7 +4064,7 @@ sub add_sync {
         rebuild_index|rebuildindex rebuild_index        numeric          null
         dbgroup                    dbgroup              0                null
 
-        conflict_strategy|standard_conflict conflict_strategy  0   null
+        conflict_strategy|standard_conflict|conflict conflict_strategy  0   null
         relation|relations|table|tables     tables             0   null
         db|databases|database|databases|dbs dbs                0   null
     };