Tom Huang / git_test

Download as
Browse Code »

Commit 432634423bf88ddbb60ba212674b5dd90c35a533

Authored by Jeff Chen
2 parents 2cc805ef81 12cac066e6
Exists in master

Merge branch 'master' of http://gitlab.sanlien.com.tw/tom/git_test 

# Conflicts:
#	changeLog.txt
Showing 2 changed files   Show diff stats
1 <<<<<<< HEAD
2 fdfshsj
3 htehtrjj
4 getjryrl
5 =======
6 fdfshsj
7 htehtrjj
8 getjryrl
9 >>>>>>> 170b5319e9961afd5839d2ad8b2d880fad3f7e3f
10 fjfsykiy8
11
12
13
14
15
16
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
1 ********************************************************************************* 16 *********************************************************************************
2 This AmCharts software is free under a linkware license. 17 This AmCharts software is free under a linkware license.
3 18
4 This means you may not remove or hide in any other way link to amcharts 19 This means you may not remove or hide in any other way link to amcharts
5 web site - www.amcharts.com. 20 web site - www.amcharts.com.
6 21
7 If you wish to remove the link, you should purchase commercial license. 22 If you wish to remove the link, you should purchase commercial license.
8 23
9 You may not redistribute, sublicense or sell this program without written 24 You may not redistribute, sublicense or sell this program without written
10 permission of Antanas Marcelionis, the author of amcharts software. 25 permission of Antanas Marcelionis, the author of amcharts software.
11 26
12 This software is provided without warranty. 27 This software is provided without warranty.
13 ********************************************************************************* 28 *********************************************************************************
14 A commercial version (without link) is available at amCharts's website: 29 A commercial version (without link) is available at amCharts's website:
15 http://shop.amcharts.com/ 30 http://shop.amcharts.com/
16 *********************************************************************************
31 *********************************************************************************
32
33 <<<<<<< .mine
34 *********************************************************************************
35 This AmCharts software is free under a linkware license.
36
37 This means you may not remove or hide in any other way link to amcharts
38 web site - www.amcharts.com.
39
40 If you wish to remove the link, you should purchase commercial license.
41
42 You may not redistribute, sublicense or sell this program without written
43 permission of Antanas Marcelionis, the author of amcharts software.
44
45 This software is provided without warranty.
46 *********************************************************************************
47 A commercial version (without link) is available at amCharts's website:
48 http://shop.amcharts.com/
49 *********************************************************************************
50 aaa
51 bbb
52 =======
53 *********************************************************************************
54 This AmCharts software is free under a linkware license.
55
56 This means you may not remove or hide in any other way link to amcharts
57 web site - www.amcharts.com.
58
59 If you wish to remove the link, you should purchase commercial license.
60
61 You may not redistribute, sublicense or sell this program without written
62 permission of Antanas Marcelionis, the author of amcharts software.
63
64 This software is provided without warranty.
65 *********************************************************************************
66 A commercial version (without link) is available at amCharts's website:
67 http://shop.amcharts.com/
68 *********************************************************************************
69
70
71 >>>>>>> .theirs