diff options
Diffstat (limited to 'Git/Merge.hs')
| -rw-r--r-- | Git/Merge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Git/Merge.hs b/Git/Merge.hs index 12dfa7c1f..b3a048937 100644 --- a/Git/Merge.hs +++ b/Git/Merge.hs @@ -1,6 +1,6 @@ {- git merging - - - Copyright 2012, 2014 Joey Hess <joey@kitenet.net> + - Copyright 2012, 2014 Joey Hess <id@joeyh.name> - - Licensed under the GNU GPL version 3 or higher. -} |