Tom Huang / git_test

Blame view

licence.txt 2.3 KB
edit raw normal view history
12cac066e   tom200e   Merge branch 'mas... 
1
 








eed3c9f67
 
 tom200e
 
first file




2
3
4
5
6
7
8
9
10
11
12
13
14
15
16




  *********************************************************************************
  This AmCharts software is free under a linkware license.
  
  This means you may not remove or hide in any other way link to amcharts
  web site - www.amcharts.com.
  
  If you wish to remove the link, you should purchase commercial license.
  
  You may not redistribute, sublicense or sell this program without written
  permission of Antanas Marcelionis, the author of amcharts software.
  
  This software is provided without warranty.
  *********************************************************************************
  A commercial version (without link) is available at amCharts's website: 
  http://shop.amcharts.com/









12cac066e
 
 tom200e
 
Merge branch 'mas...




17
18
19




  *********************************************************************************
  
  <<<<<<< .mine









20187f672
 
 tom200e
 
first file




20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36




  *********************************************************************************
  This AmCharts software is free under a linkware license.
  
  This means you may not remove or hide in any other way link to amcharts
  web site - www.amcharts.com.
  
  If you wish to remove the link, you should purchase commercial license.
  
  You may not redistribute, sublicense or sell this program without written
  permission of Antanas Marcelionis, the author of amcharts software.
  
  This software is provided without warranty.
  *********************************************************************************
  A commercial version (without link) is available at amCharts's website: 
  http://shop.amcharts.com/
  *********************************************************************************
  aaa









12cac066e
 
 tom200e
 
Merge branch 'mas...




37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57




  bbb
  =======
  *********************************************************************************
  This AmCharts software is free under a linkware license.
  
  This means you may not remove or hide in any other way link to amcharts
  web site - www.amcharts.com.
  
  If you wish to remove the link, you should purchase commercial license.
  
  You may not redistribute, sublicense or sell this program without written
  permission of Antanas Marcelionis, the author of amcharts software.
  
  This software is provided without warranty.
  *********************************************************************************
  A commercial version (without link) is available at amCharts's website: 
  http://shop.amcharts.com/
  *********************************************************************************
  
  
  >>>>>>> .theirs