Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove not-deleted index.vue merge file #842

Conversation

AndrewBastin
Copy link
Member

There was a merge file created by the commit 8cc7b52 which wasn't cleaned up, this PR removes it.

@AndrewBastin AndrewBastin self-assigned this May 4, 2020
@TravisBuddy
Copy link

Hey @AndrewBastin,
Your changes look good to me!

View build log

TravisBuddy Request Identifier: 1c829b60-8e54-11ea-80eb-6b769f7cd14d

@liyasthomas liyasthomas merged commit ae10af2 into hoppscotch:master May 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants