fix conflicts

This commit is contained in:
yogesh_gohil
2019-11-14 15:57:19 +05:30
parent 2dda0baa3f
commit 23112b5ecd

View File

@ -51,7 +51,7 @@ import {
faEllipsisH, faEllipsisH,
faCopy, faCopy,
faPaperPlane, faPaperPlane,
faEyeSlash faEyeSlash,
faSyncAlt faSyncAlt
} from '@fortawesome/free-solid-svg-icons' } from '@fortawesome/free-solid-svg-icons'
import { far } from '@fortawesome/free-regular-svg-icons' import { far } from '@fortawesome/free-regular-svg-icons'