From 7739ce4db6022a42a21afe067f264280e4c7bd63 Mon Sep 17 00:00:00 2001
From: Les Vogel <lesv@google.com>
Date: Mon, 25 Apr 2016 16:20:38 -0700
Subject: [PATCH] Missed a merge conflict

---
 appengine/oauth2/pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/appengine/oauth2/pom.xml b/appengine/oauth2/pom.xml
index b520b4a4f46..21d5369f001 100644
--- 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.