Commit ac25e4300b80b346c542452b3c3dcf673e6a5d17

Authored by Frank Wang

Merge branch 'test_ting' of http://gitlab.sanlien.com.tw/tom/git_test into sanlien_a

1   -fdfshsj
2 1 \ No newline at end of file
  2 +fdfshsj
  3 +htehtrjj
  4 +getjryrl
  5 +fjfsykiy8
3 6 \ No newline at end of file
... ...