# HG changeset patch # User Sylvain Thénault # Date 1255968945 -7200 # Node ID 80fb4083c29b10d623b6d57b8a10d274c71f0964 # Parent b2107f68176c2a2215e43bdfd37477d7e40de4d1 bad merge diff -r b2107f68176c -r 80fb4083c29b web/test/unittest_viewselector.py --- a/web/test/unittest_viewselector.py Mon Oct 19 18:15:39 2009 +0200 +++ b/web/test/unittest_viewselector.py Mon Oct 19 18:15:45 2009 +0200 @@ -497,7 +497,7 @@ 'moreactions': [actions.ManagePermissionsAction, actions.AddRelatedActions, actions.DeleteAction, - actions.CopyAction, + actions.CopyAction,] })