mirror of
https://github.com/apache/zeppelin
synced 2026-05-24 09:38:26 +00:00
Added path and specific wording
This commit is contained in:
parent
4a3153f980
commit
bbf26cc725
1 changed files with 5 additions and 0 deletions
5
NOTICE
5
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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue