postgres/timescaledb
1
0
Fork 0
mirror of https://github.com/timescale/timescaledb.git synced 2025-05-17 02:53:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove git merge/rebase lines from TSL

Browse Source 
It seems that a merge conflict was not completely cleaned up after
in the Timescale License.
This commit is contained in:
Rob Kiefer 2019-01-04 16:35:24 -05:00 committed by RobAtticus
parent a5bcefb0ee
commit 10c189116b
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tsl/LICENSE-TIMESCALE
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
TIMESCALE LICENSE AGREEMENT
Posted Date: December 19, 2018
@ -421,6 +420,4 @@ Agreement ("You").
Commercial Items and (b) with only those rights as are granted to all other
end users pursuant to the terms and conditions of this TSL Agreement.
Unpublished – rights reserved under the copyright laws of the United States.
=======
>>>>>>> Initial Timescale-Licensed-Module and License-Key Implementation