Skip to content

Commit 57c889e

Browse files
committed
chore: exclude .github .vscodeignore
1 parent 40eba16 commit 57c889e

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

.vscodeignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.vscode/**
2+
.github/**
23
.vscode-test/**
34
src/**
45
.gitignore
@@ -18,4 +19,4 @@ ui/index.html
1819
ui/README.md
1920
ui/package.json
2021
ui/package-lock.json
21-
ui/node_modules/**
22+
ui/node_modules/**

src/snippets/index.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ import { extensions, MarkdownString, languages, CompletionItem, CompletionItemKi
22
import * as os from 'os';
33
import { existsSync, move, mkdirSync, readdirSync, removeSync } from 'fs-extra';
44
import { join, resolve } from 'pathe';
5-
<<<<<<< HEAD
6-
import { nuxtrConfiguration } from '../utils';
7-
=======
8-
import { getConfiguration, languageSelector, generateVueFileBasicTemplate } from '../utils';
9-
>>>>>>> origin/main
5+
import { nuxtrConfiguration, languageSelector, generateVueFileBasicTemplate } from '../utils';
106

117
export enum SnippetSource {
128
nuxt = 'Nuxt',

ui/build/assets/index.js

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)