From 23112b5ecd167d491f197ad41440fad7e2b4eedc Mon Sep 17 00:00:00 2001 From: yogesh_gohil Date: Thu, 14 Nov 2019 15:57:19 +0530 Subject: [PATCH] fix conflicts --- resources/assets/plugins/vue-font-awesome/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/plugins/vue-font-awesome/index.js b/resources/assets/plugins/vue-font-awesome/index.js index 04aa4be6..3de7d44e 100644 --- a/resources/assets/plugins/vue-font-awesome/index.js +++ b/resources/assets/plugins/vue-font-awesome/index.js @@ -51,7 +51,7 @@ import { faEllipsisH, faCopy, faPaperPlane, - faEyeSlash + faEyeSlash, faSyncAlt } from '@fortawesome/free-solid-svg-icons' import { far } from '@fortawesome/free-regular-svg-icons'