Skip to content

Commit a39ad62

Browse files
lesvlesv
committed
Missed a merge conflict (GoogleCloudPlatform#190)
1 parent 02dbdfc commit a39ad62

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

‎appengine/oauth2/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<!--
2-
<<<<<<< HEAD
32
Copyright 2016 Google Inc. All Rights Reserved.
4-
=======
5-
Copyright 2015 Google Inc. All Rights Reserved.
6-
>>>>>>> master
73
84
Licensed under the Apache License, Version 2.0 (the "License");
95
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)