OSDN Git Service

fixed the confilict merge from master
authorZhiting Lin <zlin035@uottawa.ca>
Thu, 19 Apr 2018 01:44:55 +0000 (09:44 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Thu, 19 Apr 2018 01:44:55 +0000 (09:44 +0800)
commitbd6575e130da8bcb421531c9df4ce2dde88f81df
treed3a970f2e5d6f1b78956fa31ecb5bc5bb4515886
parent555dca03fee5d349aced570fa64f6107546a1c8c
parent5d1f1a2dad8f3cdec4425cc562b744bbfb7734df
fixed the confilict merge from master
src/features/assets/components/AssetShow.jsx
src/features/mockhsm/components/List.jsx
src/features/mockhsm/components/Show.jsx
src/features/transactions/components/New/New.jsx
src/features/transactions/components/Show.jsx
src/features/transactions/components/Summary/Summary.jsx