diff options
| author | Chris Ball <cjb@laptop.org> | 2009-07-02 14:00:04 -0400 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2009-07-02 14:00:04 -0400 |
| commit | 64f62aa2bb841c483e8cb2b663434b3ad3038f4c (patch) | |
| tree | 644cfa2fef611ad265d3116ac83026bf0181f7c1 /becommands/merge.py | |
| parent | 21a0bb0ae113ad9eaa6d94d36c8d0e5ca8508d7f (diff) | |
| parent | a536332660c8374e2000541e2db5ad6cea3b0e5e (diff) | |
| download | bugseverywhere-64f62aa2bb841c483e8cb2b663434b3ad3038f4c.tar.gz | |
Pull darcs fix, copyright updates from W. Trevor King
Diffstat (limited to 'becommands/merge.py')
| -rw-r--r-- | becommands/merge.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/becommands/merge.py b/becommands/merge.py index 8232282..4bec6bf 100644 --- a/becommands/merge.py +++ b/becommands/merge.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005 Aaron Bentley and Panometrics, Inc. +# Copyright (C) 2008-2009 W. Trevor King <wking@drexel.edu> # <abentley@panoramicfeedback.com> # # This program is free software; you can redistribute it and/or modify |