Missed a merge conflict (#190)

lesv · lesv · commit a39ad6236077 · 2016-04-25T16:23:08.000-07:00
diff --git a/appengine/oauth2/pom.xml b/appengine/oauth2/pom.xml
@@ -1,9 +1,5 @@
 <!--
-<<<<<<< HEAD
  Copyright 2016 Google Inc. All Rights Reserved.
-=======
-Copyright 2015 Google Inc. All Rights Reserved.
->>>>>>> master
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
