diff options
Diffstat (limited to 'libbe/command/merge.py')
| -rw-r--r-- | libbe/command/merge.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libbe/command/merge.py b/libbe/command/merge.py index 7fd62bb..0f49de9 100644 --- a/libbe/command/merge.py +++ b/libbe/command/merge.py @@ -1,4 +1,5 @@ -# Copyright (C) 2008-2011 Gianluca Montecchi <gian@grys.it> +# Copyright (C) 2008-2011 Chris Ball <cjb@laptop.org> +# Gianluca Montecchi <gian@grys.it> # W. Trevor King <wking@drexel.edu> # # This file is part of Bugs Everywhere. |