OSDN Git Service

resolve confilict
authorZhiting Lin <zlin035@uottawa.ca>
Tue, 17 Apr 2018 01:24:44 +0000 (09:24 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Tue, 17 Apr 2018 01:24:44 +0000 (09:24 +0800)
commit79b05a5397a219eab027799b4f87b6751e8e78a8
tree73126865e232c11434ebf19a4a42fd45b634ef30
parent6d073c452c5de2fea5f4ac520ca1edac43583b4c
parent30a73bb9d9c7fa31603e7b503183926485f97283
resolve confilict
src/features/core/reducers.js