diff options
Diffstat (limited to 'gerrit-server/src/main/java/com/google/gerrit/server/git/StagingMergeDelegate.java')
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/git/StagingMergeDelegate.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/StagingMergeDelegate.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/StagingMergeDelegate.java index eb777850af..64e920834a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/StagingMergeDelegate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/StagingMergeDelegate.java @@ -1,4 +1,4 @@ -// Copyright (C) 2011 The Android Open Source Project +// Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. |