[PR #842] [MERGED] Remove not-deleted index.vue merge file #2893

New issue

Closed

opened 2026-03-17 00:33:32 +03:00 by kerem · 0 comments

kerem commented

2026-03-17 00:33:32 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/hoppscotch/hoppscotch/pull/842
Author: @AndrewBastin
Created: 5/4/2020
Status: ✅ Merged
Merged: 5/5/2020
Merged by: @liyasthomas

Base: master ← Head: cleanup/remove-index-conflict-file

📝 Commits (1)

9092c06 Remove not-deleted index.vue merge file

📊 Changes

1 file changed (+0 additions, -2937 deletions)

View changed files

➖ pages/index.vue.orig (+0 -2937)

📄 Description

There was a merge file created by the commit github.com/liyasthomas/postwoman@8cc7b525d9 which wasn't cleaned up, this PR removes it.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/hoppscotch/hoppscotch/pull/842 **Author:** [@AndrewBastin](https://github.com/AndrewBastin) **Created:** 5/4/2020 **Status:** ✅ Merged **Merged:** 5/5/2020 **Merged by:** [@liyasthomas](https://github.com/liyasthomas) **Base:** `master` ← **Head:** `cleanup/remove-index-conflict-file` --- ### 📝 Commits (1) - [`9092c06`](https://github.com/hoppscotch/hoppscotch/commit/9092c06e711b573a94f53b3e7e7c4a1e5e54f341) Remove not-deleted index.vue merge file ### 📊 Changes **1 file changed** (+0 additions, -2937 deletions) <details> <summary>View changed files</summary> ➖ `pages/index.vue.orig` (+0 -2937) </details> ### 📄 Description There was a merge file created by the commit https://github.com/liyasthomas/postwoman/commit/8cc7b525d91c86667ba1c2f862f765ebbf54a967 which wasn't cleaned up, this PR removes it. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>