Skip to content

G
gitlab-ce
Commit edf2268c authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in app/assets/javascripts/ide/stores/actions.js 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent c285c405
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 5 deletions
app/assets/javascripts/ide/stores/actions.js
View file @ edf2268c
import Vue from 'vue'; import Vue from 'vue';
import { visitUrl } from '~/lib/utils/url_utility'; import { visitUrl } from '~/lib/utils/url_utility';
<<<<<<< HEAD
=======
import flash from '~/flash';
import service from '../services';
>>>>>>> upstream/master
import * as types from './mutation_types'; import * as types from './mutation_types';
export const redirectToUrl = (_, url) => visitUrl(url); export const redirectToUrl = (_, url) => visitUrl(url);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7