Authored by 郭成尧

conflict

@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 * @Author: Targaryen 3 * @Author: Targaryen
4 * @Date: 2017-01-04 15:17:51 4 * @Date: 2017-01-04 15:17:51
5 * @Last Modified by: Targaryen 5 * @Last Modified by: Targaryen
6 - * @Last Modified time: 2017-02-20 18:15:05 6 + * @Last Modified time: 2017-02-20 18:16:09
7 */ 7 */
8 8
9 'use strict'; 9 'use strict';