Added path and specific wording

This commit is contained in:
Babu Prasad Elumalai 2016-07-18 07:23:53 +00:00
parent 4a3153f980
commit bbf26cc725

5
NOTICE
View file

@ -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)