yesterday |
none |
Merged repository |
|
GuestScreen/common |
|
yesterday |
none |
Merged repository |
|
GuestScreen/common |
|
yesterday |
none |
Failed merge on repository |
|
GuestScreen/common |
|
error: Your local changes to the following files would be overwritten by checkout:
Api.http
changelog.js
http-client.env.json
public-bk/index.html
public-bkd/index.html
public-kfc/index.html
public-ucs/index.html
src/App.vue
src/assets/css/bs-custom.styl
src/assets/css/reset.css
src/assets/css/style.styl
src/assets/css/variables.styl
src/components/Header.vue
src/components/Sidebar.vue
src/components/ValueSelectCustom.vue
src/i18n.js
src/main.ts
src/modules/condition.js
src/modules/main-settings.js
src/modules/modes.js
src/modules/scenario.js
src/modules/scenes.js
src/modules/screenPage.js
src/router/router.js
src/services/api.js
src/services/const.js
src/services/init.js
src/services/md5.js
src/services/notify.js
src/services/prepareScene.js
src/services/refs.js
src/services/viewhelpers.js
src/store.js
src/views/Configurator/Condition/ConditionSchedule.vue
src/views/Configurator/Configurator.vue
src/views/Configurator/Dashboard.vue
src/views/Configurator/MediaWindow.vue
src/views/Configurator/ModeEdit.vue
src/views/Configurator/Modes.vue
src/views/Configurator/ScenarioEdit.vue
src/views/Configurator/Scenarios.vue
src/views/Configurator/SceneEdit.vue
src/views/Configurator/Scenes.vue
src/views/Configurator/Settings/components/NameTypesSection.vue
src/views/Configurator/Votes.vue
src/views/Configurator/scenes-template/check.vue
src/views/Configurator/scenes-template/custom.vue
src/views/Configurator/scenes-template/display.vue
src/views/Configurator/scenes-template/gallery.vue
src/views/Configurator/scenes-template/image.vue
src/views/Configurator/scenes-template/imageText.vue
src/views/Configurator/scenes-template/qrCode.vue
src/views/Configurator/scenes-template/qualityService.vue
src/views/Configurator/scenes-template/text.vue
src/views/Configurator/scenes-template/video.vue
src/views/Error404.vue
src/views/GS-bk/check.vue
src/views/GS-bk/css/fonts.css
src/views/GS-bk/custom.vue
src/views/GS-bk/display.vue
src/views/GS-bk/gallery.vue
src/views/GS-bk/image.vue
src/views/GS-bk/imageText.vue
src/views/GS-bk/qrCode.vue
src/views/GS-bk/qualityService.vue
src/views/GS-bk/text.vue
src/views/GS-bk/video.vue
src/views/GS-bkd/check.vue
src/views/GS-bkd/css/fonts.css
src/views/GS-bkd/custom.vue
src/views/GS-bkd/display.vue
src/views/GS-bkd/gallery.vue
src/views/GS-bkd/image.vue
src/views/GS-bkd/imageText.vue
src/views/GS-bkd/qrCode.vue
src/views/GS-bkd/qualityService.vue
src/views/GS-bkd/text.vue
src/views/GS-bkd/video.vue
src/views/GS-kfc-yum/check.vue
src/views/GS-kfc-yum/css/fonts.css
src/views/GS-kfc-yum/custom.vue
src/views/GS-kfc-yum/display.vue
src/views/GS-kfc-yum/gallery.vue
src/views/GS-kfc-yum/image.vue
src/views/GS-kfc-yum/imageText.vue
src/views/GS-kfc-yum/qrCode.vue
src/views/GS-kfc-yum/qualityService.vue
src/views/GS-kfc-yum/text.vue
src/views/GS-kfc-yum/video.vue
src/views/GS-kfc/check.vue
src/views/GS-kfc/css/fonts.css
src/views/GS-kfc/custom.vue
src/views/GS-kfc/display.vue
src/views/GS-kfc/gallery.vue
src/views/GS-kfc/image.vue
src/views/GS-kfc/imageText.vue
src/views/GS-kfc/qrCode.vue
src/views/GS-kfc/qualityService.vue
src/views/GS-kfc/text.vue
src/views/GS-kfc/video.vue
src/views/GS-ucs/check.vue
src/views/GS-ucs/css/fonts.css
src/views/GS-ucs/custom.vue
src/views/GS-ucs/display.vue
src/views/GS-ucs/gallery.vue
src/views/GS-ucs/image.vue
src/views/GS-ucs/imageText.vue
src/views/GS-ucs/qrCode.vue
src/views/GS-ucs/qualityService.vue
src/views/GS-ucs/text.vue
src/views/GS-ucs/video.vue
src/views/License/DealerAuth.vue
src/views/License/GetLicense.vue
src/views/Mixins/checkMixin.js
src/views/ScreenPage.vue
src/views/components/DishIcon.vue
src/views/components/DishQuantity.vue
src/views/components/DishQuantityWithSum.vue
src/views/components/PaySum.vue
vue.config.js
Please, commit your changes or stash them before you can switch branches.
Aborting (1) |
|
yesterday |
none |
Failed merge on repository |
|
GuestScreen/common |
|
error: Your local changes to the following files would be overwritten by checkout:
Api.http
changelog.js
http-client.env.json
public-bk/index.html
public-bkd/index.html
public-kfc/index.html
public-ucs/index.html
src/App.vue
src/assets/css/bs-custom.styl
src/assets/css/reset.css
src/assets/css/style.styl
src/assets/css/variables.styl
src/components/Header.vue
src/components/Sidebar.vue
src/components/ValueSelectCustom.vue
src/i18n.js
src/main.ts
src/modules/condition.js
src/modules/main-settings.js
src/modules/modes.js
src/modules/scenario.js
src/modules/scenes.js
src/modules/screenPage.js
src/router/router.js
src/services/api.js
src/services/const.js
src/services/init.js
src/services/md5.js
src/services/notify.js
src/services/prepareScene.js
src/services/refs.js
src/services/viewhelpers.js
src/store.js
src/views/Configurator/Condition/ConditionSchedule.vue
src/views/Configurator/Configurator.vue
src/views/Configurator/Dashboard.vue
src/views/Configurator/MediaWindow.vue
src/views/Configurator/ModeEdit.vue
src/views/Configurator/Modes.vue
src/views/Configurator/ScenarioEdit.vue
src/views/Configurator/Scenarios.vue
src/views/Configurator/SceneEdit.vue
src/views/Configurator/Scenes.vue
src/views/Configurator/Settings/components/NameTypesSection.vue
src/views/Configurator/Votes.vue
src/views/Configurator/scenes-template/check.vue
src/views/Configurator/scenes-template/custom.vue
src/views/Configurator/scenes-template/display.vue
src/views/Configurator/scenes-template/gallery.vue
src/views/Configurator/scenes-template/image.vue
src/views/Configurator/scenes-template/imageText.vue
src/views/Configurator/scenes-template/qrCode.vue
src/views/Configurator/scenes-template/qualityService.vue
src/views/Configurator/scenes-template/text.vue
src/views/Configurator/scenes-template/video.vue
src/views/Error404.vue
src/views/GS-bk/check.vue
src/views/GS-bk/css/fonts.css
src/views/GS-bk/custom.vue
src/views/GS-bk/display.vue
src/views/GS-bk/gallery.vue
src/views/GS-bk/image.vue
src/views/GS-bk/imageText.vue
src/views/GS-bk/qrCode.vue
src/views/GS-bk/qualityService.vue
src/views/GS-bk/text.vue
src/views/GS-bk/video.vue
src/views/GS-bkd/check.vue
src/views/GS-bkd/css/fonts.css
src/views/GS-bkd/custom.vue
src/views/GS-bkd/display.vue
src/views/GS-bkd/gallery.vue
src/views/GS-bkd/image.vue
src/views/GS-bkd/imageText.vue
src/views/GS-bkd/qrCode.vue
src/views/GS-bkd/qualityService.vue
src/views/GS-bkd/text.vue
src/views/GS-bkd/video.vue
src/views/GS-kfc-yum/check.vue
src/views/GS-kfc-yum/css/fonts.css
src/views/GS-kfc-yum/custom.vue
src/views/GS-kfc-yum/display.vue
src/views/GS-kfc-yum/gallery.vue
src/views/GS-kfc-yum/image.vue
src/views/GS-kfc-yum/imageText.vue
src/views/GS-kfc-yum/qrCode.vue
src/views/GS-kfc-yum/qualityService.vue
src/views/GS-kfc-yum/text.vue
src/views/GS-kfc-yum/video.vue
src/views/GS-kfc/check.vue
src/views/GS-kfc/css/fonts.css
src/views/GS-kfc/custom.vue
src/views/GS-kfc/display.vue
src/views/GS-kfc/gallery.vue
src/views/GS-kfc/image.vue
src/views/GS-kfc/imageText.vue
src/views/GS-kfc/qrCode.vue
src/views/GS-kfc/qualityService.vue
src/views/GS-kfc/text.vue
src/views/GS-kfc/video.vue
src/views/GS-ucs/check.vue
src/views/GS-ucs/css/fonts.css
src/views/GS-ucs/custom.vue
src/views/GS-ucs/display.vue
src/views/GS-ucs/gallery.vue
src/views/GS-ucs/image.vue
src/views/GS-ucs/imageText.vue
src/views/GS-ucs/qrCode.vue
src/views/GS-ucs/qualityService.vue
src/views/GS-ucs/text.vue
src/views/GS-ucs/video.vue
src/views/License/DealerAuth.vue
src/views/License/GetLicense.vue
src/views/Mixins/checkMixin.js
src/views/ScreenPage.vue
src/views/components/DishIcon.vue
src/views/components/DishQuantity.vue
src/views/components/DishQuantityWithSum.vue
src/views/components/PaySum.vue
vue.config.js
Please, commit your changes or stash them before you can switch branches.
Aborting (1) |
|
yesterday |
none |
Failed merge on repository |
|
GuestScreen/common |
|
error: Your local changes to the following files would be overwritten by checkout:
Api.http
changelog.js
http-client.env.json
public-bk/index.html
public-bkd/index.html
public-kfc/index.html
public-ucs/index.html
src/App.vue
src/assets/css/bs-custom.styl
src/assets/css/reset.css
src/assets/css/style.styl
src/assets/css/variables.styl
src/components/Header.vue
src/components/Sidebar.vue
src/components/ValueSelectCustom.vue
src/i18n.js
src/main.ts
src/modules/condition.js
src/modules/main-settings.js
src/modules/modes.js
src/modules/scenario.js
src/modules/scenes.js
src/modules/screenPage.js
src/router/router.js
src/services/api.js
src/services/const.js
src/services/init.js
src/services/md5.js
src/services/notify.js
src/services/prepareScene.js
src/services/refs.js
src/services/viewhelpers.js
src/store.js
src/views/Configurator/Condition/ConditionSchedule.vue
src/views/Configurator/Configurator.vue
src/views/Configurator/Dashboard.vue
src/views/Configurator/MediaWindow.vue
src/views/Configurator/ModeEdit.vue
src/views/Configurator/Modes.vue
src/views/Configurator/ScenarioEdit.vue
src/views/Configurator/Scenarios.vue
src/views/Configurator/SceneEdit.vue
src/views/Configurator/Scenes.vue
src/views/Configurator/Settings/components/NameTypesSection.vue
src/views/Configurator/Votes.vue
src/views/Configurator/scenes-template/check.vue
src/views/Configurator/scenes-template/custom.vue
src/views/Configurator/scenes-template/display.vue
src/views/Configurator/scenes-template/gallery.vue
src/views/Configurator/scenes-template/image.vue
src/views/Configurator/scenes-template/imageText.vue
src/views/Configurator/scenes-template/qrCode.vue
src/views/Configurator/scenes-template/qualityService.vue
src/views/Configurator/scenes-template/text.vue
src/views/Configurator/scenes-template/video.vue
src/views/Error404.vue
src/views/GS-bk/check.vue
src/views/GS-bk/css/fonts.css
src/views/GS-bk/custom.vue
src/views/GS-bk/display.vue
src/views/GS-bk/gallery.vue
src/views/GS-bk/image.vue
src/views/GS-bk/imageText.vue
src/views/GS-bk/qrCode.vue
src/views/GS-bk/qualityService.vue
src/views/GS-bk/text.vue
src/views/GS-bk/video.vue
src/views/GS-bkd/check.vue
src/views/GS-bkd/css/fonts.css
src/views/GS-bkd/custom.vue
src/views/GS-bkd/display.vue
src/views/GS-bkd/gallery.vue
src/views/GS-bkd/image.vue
src/views/GS-bkd/imageText.vue
src/views/GS-bkd/qrCode.vue
src/views/GS-bkd/qualityService.vue
src/views/GS-bkd/text.vue
src/views/GS-bkd/video.vue
src/views/GS-kfc-yum/check.vue
src/views/GS-kfc-yum/css/fonts.css
src/views/GS-kfc-yum/custom.vue
src/views/GS-kfc-yum/display.vue
src/views/GS-kfc-yum/gallery.vue
src/views/GS-kfc-yum/image.vue
src/views/GS-kfc-yum/imageText.vue
src/views/GS-kfc-yum/qrCode.vue
src/views/GS-kfc-yum/qualityService.vue
src/views/GS-kfc-yum/text.vue
src/views/GS-kfc-yum/video.vue
src/views/GS-kfc/check.vue
src/views/GS-kfc/css/fonts.css
src/views/GS-kfc/custom.vue
src/views/GS-kfc/display.vue
src/views/GS-kfc/gallery.vue
src/views/GS-kfc/image.vue
src/views/GS-kfc/imageText.vue
src/views/GS-kfc/qrCode.vue
src/views/GS-kfc/qualityService.vue
src/views/GS-kfc/text.vue
src/views/GS-kfc/video.vue
src/views/GS-ucs/check.vue
src/views/GS-ucs/css/fonts.css
src/views/GS-ucs/custom.vue
src/views/GS-ucs/display.vue
src/views/GS-ucs/gallery.vue
src/views/GS-ucs/image.vue
src/views/GS-ucs/imageText.vue
src/views/GS-ucs/qrCode.vue
src/views/GS-ucs/qualityService.vue
src/views/GS-ucs/text.vue
src/views/GS-ucs/video.vue
src/views/License/DealerAuth.vue
src/views/License/GetLicense.vue
src/views/Mixins/checkMixin.js
src/views/ScreenPage.vue
src/views/components/DishIcon.vue
src/views/components/DishQuantity.vue
src/views/components/DishQuantityWithSum.vue
src/views/components/PaySum.vue
vue.config.js
Please, commit your changes or stash them before you can switch branches.
Aborting (1) |
|
yesterday |
none |
Failed merge on repository |
|
GuestScreen/common |
|
error: Your local changes to the following files would be overwritten by checkout:
Api.http
changelog.js
http-client.env.json
public-bk/index.html
public-bkd/index.html
public-kfc/index.html
public-ucs/index.html
src/App.vue
src/assets/css/bs-custom.styl
src/assets/css/reset.css
src/assets/css/style.styl
src/assets/css/variables.styl
src/components/Header.vue
src/components/Sidebar.vue
src/components/ValueSelectCustom.vue
src/i18n.js
src/main.ts
src/modules/condition.js
src/modules/main-settings.js
src/modules/modes.js
src/modules/scenario.js
src/modules/scenes.js
src/modules/screenPage.js
src/router/router.js
src/services/api.js
src/services/const.js
src/services/init.js
src/services/md5.js
src/services/notify.js
src/services/prepareScene.js
src/services/refs.js
src/services/viewhelpers.js
src/store.js
src/views/Configurator/Condition/ConditionSchedule.vue
src/views/Configurator/Configurator.vue
src/views/Configurator/Dashboard.vue
src/views/Configurator/MediaWindow.vue
src/views/Configurator/ModeEdit.vue
src/views/Configurator/Modes.vue
src/views/Configurator/ScenarioEdit.vue
src/views/Configurator/Scenarios.vue
src/views/Configurator/SceneEdit.vue
src/views/Configurator/Scenes.vue
src/views/Configurator/Settings/components/NameTypesSection.vue
src/views/Configurator/Votes.vue
src/views/Configurator/scenes-template/check.vue
src/views/Configurator/scenes-template/custom.vue
src/views/Configurator/scenes-template/display.vue
src/views/Configurator/scenes-template/gallery.vue
src/views/Configurator/scenes-template/image.vue
src/views/Configurator/scenes-template/imageText.vue
src/views/Configurator/scenes-template/qrCode.vue
src/views/Configurator/scenes-template/qualityService.vue
src/views/Configurator/scenes-template/text.vue
src/views/Configurator/scenes-template/video.vue
src/views/Error404.vue
src/views/GS-bk/check.vue
src/views/GS-bk/css/fonts.css
src/views/GS-bk/custom.vue
src/views/GS-bk/display.vue
src/views/GS-bk/gallery.vue
src/views/GS-bk/image.vue
src/views/GS-bk/imageText.vue
src/views/GS-bk/qrCode.vue
src/views/GS-bk/qualityService.vue
src/views/GS-bk/text.vue
src/views/GS-bk/video.vue
src/views/GS-bkd/check.vue
src/views/GS-bkd/css/fonts.css
src/views/GS-bkd/custom.vue
src/views/GS-bkd/display.vue
src/views/GS-bkd/gallery.vue
src/views/GS-bkd/image.vue
src/views/GS-bkd/imageText.vue
src/views/GS-bkd/qrCode.vue
src/views/GS-bkd/qualityService.vue
src/views/GS-bkd/text.vue
src/views/GS-bkd/video.vue
src/views/GS-kfc-yum/check.vue
src/views/GS-kfc-yum/css/fonts.css
src/views/GS-kfc-yum/custom.vue
src/views/GS-kfc-yum/display.vue
src/views/GS-kfc-yum/gallery.vue
src/views/GS-kfc-yum/image.vue
src/views/GS-kfc-yum/imageText.vue
src/views/GS-kfc-yum/qrCode.vue
src/views/GS-kfc-yum/qualityService.vue
src/views/GS-kfc-yum/text.vue
src/views/GS-kfc-yum/video.vue
src/views/GS-kfc/check.vue
src/views/GS-kfc/css/fonts.css
src/views/GS-kfc/custom.vue
src/views/GS-kfc/display.vue
src/views/GS-kfc/gallery.vue
src/views/GS-kfc/image.vue
src/views/GS-kfc/imageText.vue
src/views/GS-kfc/qrCode.vue
src/views/GS-kfc/qualityService.vue
src/views/GS-kfc/text.vue
src/views/GS-kfc/video.vue
src/views/GS-ucs/check.vue
src/views/GS-ucs/css/fonts.css
src/views/GS-ucs/custom.vue
src/views/GS-ucs/display.vue
src/views/GS-ucs/gallery.vue
src/views/GS-ucs/image.vue
src/views/GS-ucs/imageText.vue
src/views/GS-ucs/qrCode.vue
src/views/GS-ucs/qualityService.vue
src/views/GS-ucs/text.vue
src/views/GS-ucs/video.vue
src/views/License/DealerAuth.vue
src/views/License/GetLicense.vue
src/views/Mixins/checkMixin.js
src/views/ScreenPage.vue
src/views/components/DishIcon.vue
src/views/components/DishQuantity.vue
src/views/components/DishQuantityWithSum.vue
src/views/components/PaySum.vue
vue.config.js
Please, commit your changes or stash them before you can switch branches.
Aborting (1) |
|
yesterday |
none |
New component alert |
Could not merge the repository. |
GuestScreen/common |
|
yesterday |
none |
Failed merge on repository |
|
GuestScreen/common |
|
error: Your local changes to the following files would be overwritten by checkout:
Api.http
changelog.js
http-client.env.json
public-bk/index.html
public-bkd/index.html
public-kfc/index.html
public-ucs/index.html
src/App.vue
src/assets/css/bs-custom.styl
src/assets/css/reset.css
src/assets/css/style.styl
src/assets/css/variables.styl
src/components/Header.vue
src/components/Sidebar.vue
src/components/ValueSelectCustom.vue
src/i18n.js
src/main.ts
src/modules/condition.js
src/modules/main-settings.js
src/modules/modes.js
src/modules/scenario.js
src/modules/scenes.js
src/modules/screenPage.js
src/router/router.js
src/services/api.js
src/services/const.js
src/services/init.js
src/services/md5.js
src/services/notify.js
src/services/prepareScene.js
src/services/refs.js
src/services/viewhelpers.js
src/store.js
src/views/Configurator/Condition/ConditionSchedule.vue
src/views/Configurator/Configurator.vue
src/views/Configurator/Dashboard.vue
src/views/Configurator/MediaWindow.vue
src/views/Configurator/ModeEdit.vue
src/views/Configurator/Modes.vue
src/views/Configurator/ScenarioEdit.vue
src/views/Configurator/Scenarios.vue
src/views/Configurator/SceneEdit.vue
src/views/Configurator/Scenes.vue
src/views/Configurator/Settings/components/NameTypesSection.vue
src/views/Configurator/Votes.vue
src/views/Configurator/scenes-template/check.vue
src/views/Configurator/scenes-template/custom.vue
src/views/Configurator/scenes-template/display.vue
src/views/Configurator/scenes-template/gallery.vue
src/views/Configurator/scenes-template/image.vue
src/views/Configurator/scenes-template/imageText.vue
src/views/Configurator/scenes-template/qrCode.vue
src/views/Configurator/scenes-template/qualityService.vue
src/views/Configurator/scenes-template/text.vue
src/views/Configurator/scenes-template/video.vue
src/views/Error404.vue
src/views/GS-bk/check.vue
src/views/GS-bk/css/fonts.css
src/views/GS-bk/custom.vue
src/views/GS-bk/display.vue
src/views/GS-bk/gallery.vue
src/views/GS-bk/image.vue
src/views/GS-bk/imageText.vue
src/views/GS-bk/qrCode.vue
src/views/GS-bk/qualityService.vue
src/views/GS-bk/text.vue
src/views/GS-bk/video.vue
src/views/GS-bkd/check.vue
src/views/GS-bkd/css/fonts.css
src/views/GS-bkd/custom.vue
src/views/GS-bkd/display.vue
src/views/GS-bkd/gallery.vue
src/views/GS-bkd/image.vue
src/views/GS-bkd/imageText.vue
src/views/GS-bkd/qrCode.vue
src/views/GS-bkd/qualityService.vue
src/views/GS-bkd/text.vue
src/views/GS-bkd/video.vue
src/views/GS-kfc-yum/check.vue
src/views/GS-kfc-yum/css/fonts.css
src/views/GS-kfc-yum/custom.vue
src/views/GS-kfc-yum/display.vue
src/views/GS-kfc-yum/gallery.vue
src/views/GS-kfc-yum/image.vue
src/views/GS-kfc-yum/imageText.vue
src/views/GS-kfc-yum/qrCode.vue
src/views/GS-kfc-yum/qualityService.vue
src/views/GS-kfc-yum/text.vue
src/views/GS-kfc-yum/video.vue
src/views/GS-kfc/check.vue
src/views/GS-kfc/css/fonts.css
src/views/GS-kfc/custom.vue
src/views/GS-kfc/display.vue
src/views/GS-kfc/gallery.vue
src/views/GS-kfc/image.vue
src/views/GS-kfc/imageText.vue
src/views/GS-kfc/qrCode.vue
src/views/GS-kfc/qualityService.vue
src/views/GS-kfc/text.vue
src/views/GS-kfc/video.vue
src/views/GS-ucs/check.vue
src/views/GS-ucs/css/fonts.css
src/views/GS-ucs/custom.vue
src/views/GS-ucs/display.vue
src/views/GS-ucs/gallery.vue
src/views/GS-ucs/image.vue
src/views/GS-ucs/imageText.vue
src/views/GS-ucs/qrCode.vue
src/views/GS-ucs/qualityService.vue
src/views/GS-ucs/text.vue
src/views/GS-ucs/video.vue
src/views/License/DealerAuth.vue
src/views/License/GetLicense.vue
src/views/Mixins/checkMixin.js
src/views/ScreenPage.vue
src/views/components/DishIcon.vue
src/views/components/DishQuantity.vue
src/views/components/DishQuantityWithSum.vue
src/views/components/PaySum.vue
vue.config.js
Please, commit your changes or stash them before you can switch branches.
Aborting (1) |
|
8 days ago |
none |
Pushed changes |
|
GuestScreen/common |
|
8 days ago |
none |
Committed changes |
|
GuestScreen/common - Slovak |
|