fix conflicts

This commit is contained in:
yogesh_gohil
2019-11-14 15:51:48 +05:30
parent 4839e57791
commit 2dda0baa3f
51 changed files with 576 additions and 226 deletions

View File

@ -52,6 +52,7 @@ import {
faCopy,
faPaperPlane,
faEyeSlash
faSyncAlt
} from '@fortawesome/free-solid-svg-icons'
import { far } from '@fortawesome/free-regular-svg-icons'
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
@ -113,7 +114,8 @@ library.add(
faShare,
faEllipsisH,
faCopy,
faPaperPlane
faPaperPlane,
faSyncAlt
)
Vue.component('font-awesome-icon', FontAwesomeIcon)