fix conflicts between Cols and updated #725

Merged

lunny merged 1 commits from lunny/fix_updated into master 2017-09-15 01:51:16 +00:00

Conversation 1 Commits 1 Files Changed 2 +29 -10

1 Commits

Author	SHA1	Message	Date
Lunny Xiao	c746e72fc8	fix conflicts between Cols and updated	2017-09-15 09:41:00 +08:00