diff options
| author | <robert.mcqueen@collabora.co.uk> | 2006-08-21 16:14:54 +0000 |
|---|---|---|
| committer | <robert.mcqueen@collabora.co.uk> | 2006-08-21 16:14:54 +0000 |
| commit | 2373a5b40089d44fa3aa580df8635019c6abf03c (patch) | |
| tree | cc43d1fb7d6c75c0cf0a5eb41fc9b84103d1f832 | |
| parent | 7242133dfa838283d4df9a47147f573bc9bada61 (diff) | |
merge conflict in copyright year form (go for 2005-6 rather than 2005, 2006)telepathy-spec-0.13.3
| -rw-r--r-- | telepathy/constants.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/telepathy/constants.py b/telepathy/constants.py index 8075172e..e360c262 100644 --- a/telepathy/constants.py +++ b/telepathy/constants.py @@ -1,7 +1,7 @@ # telepathy-spec - Base classes defining the interfaces of the Telepathy framework # -# Copyright (C) 2005 Collabora Limited -# Copyright (C) 2005 Nokia Corporation +# Copyright (C) 2005-6 Collabora Limited +# Copyright (C) 2005-6 Nokia Corporation # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public |