Added path and specific wording

babupe-g · babupe-g · commit bbf26cc7253a · 2016-07-26T19:22:07.000Z
diff --git a/NOTICE b/NOTICE
@@ -4,4 +4,9 @@ Copyright 2015 - 2016 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
+<<<<<<< HEAD
+=======
+A Portion of this software namely code under ./bigquery/*  was developed at Google (http://www.google.com/). Licensed under the Apache v2.0 License.
+
+>>>>>>> Added path and specific wording
 Portions of this software were developed at NFLabs, Inc. (http://www.nflabs.com)
