修改报错
This commit is contained in:
@@ -19,7 +19,6 @@ export default {
|
||||
ICON_LIST_RIGHT_ARROW: require('@/static/list/icon-list-right-arrow.svg'),
|
||||
ICON_ARROW_LEFT: require('@/static/detail/icon-arrow-left.svg'),
|
||||
ICON_LOGO_GO: require('@/static/detail/icon-logo-go.svg'),
|
||||
ICON_SEARCH: require('@/static/publishBall/icon-search.svg'),
|
||||
ICON_MAP: require('@/static/publishBall/icon-map.svg'),
|
||||
ICON_STADIUM: require('@/static/publishBall/icon-stadium.svg'),
|
||||
ICON_ARRORW_SMALL: require('@/static/publishBall/icon-arrow-small.svg'),
|
||||
@@ -28,13 +27,11 @@ export default {
|
||||
ICON_ADD: require('@/static/publishBall/icon-add.svg'),
|
||||
ICON_COPY: require('@/static/publishBall/icon-arrow-right.svg'),
|
||||
ICON_DELETE: require('@/static/publishBall/icon-delete.svg'),
|
||||
<<<<<<< HEAD
|
||||
ICON_RIGHT_MAX: require('@/static/publishBall/icon-right-max.svg'),
|
||||
ICON_PLUS: require('@/static/publishBall/icon-plus.svg'),
|
||||
ICON_GROUP: require('@/static/publishBall/icon-group.svg'),
|
||||
ICON_PERSON: require('@/static/publishBall/icon-person.svg'),
|
||||
ICON_PUBLISH: require('@/static/publishBall/icon-publish.png'),
|
||||
=======
|
||||
ICON_CIRCLE_UNSELECT: require('@/static/publishBall/icon-circle-unselect.svg'),
|
||||
ICON_CIRCLE_SELECT: require('@/static/publishBall/icon-circle-select-ring.svg'),
|
||||
ICON_CIRCLE_SELECT_ARROW: require('@/static/publishBall/icon-circle-select-arrow.svg'),
|
||||
@@ -53,5 +50,4 @@ export default {
|
||||
ICON_LIST_PLAYING_GAME: require('@/static/list/icon-paying-game.svg'),
|
||||
ICON_LIST_LOAD_ERROR: require('@/static/list/icon-load-error.svg'),
|
||||
ICON_LIST_RELOAD: require('@/static/list/icon-reload.svg'),
|
||||
>>>>>>> d92419f3c5648a67d1b6857d66d6c92a4bece034
|
||||
}
|
||||
Reference in New Issue
Block a user