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 duplicate lines in gitignore #1214

Merged
merged 1 commit into from Jan 5, 2018

Conversation

@nash403
Copy link
Contributor

nash403 commented Jan 2, 2018

No description provided.

Honoré Nintunze
@LinusBorg

This comment has been minimized.

Copy link
Contributor

LinusBorg commented Jan 5, 2018

Thanks. Probably some leftovers from a merge.

@LinusBorg LinusBorg merged commit 1d51244 into vuejs-templates:develop Jan 5, 2018
1 check failed
1 check failed
ci/circleci Your tests failed on CircleCI
Details
LinusBorg added a commit that referenced this pull request Jan 13, 2018
* develop:
  bump template version (1.3.0)
  chore: remove extra comma (#1240)
  Improve template CI tests (close #1218)
  Revert "fix bad alias (fix #1239)"
  Typo, whitespace and Style Guide fixes (#1231)
  Update runner.js (#1235)
  remove unnecessary option.
  bumping eslint dependencies
  fix bad alias (fix #1239)
  remove duplicate lines in gitignore (#1214)
  fix historyFallback rewrite for Windows systems
  improved comments in eslintrc
  updated linting docs.
  respect eslint rule for order of options.
  switch to essential ruleset.
  add eslint-plugin-vue

# Conflicts:
#	template/build/build.js
c0defre4k pushed a commit to neonblack-at/webpack that referenced this pull request Jan 23, 2018
* vuejs-templates/master: (66 commits)
  Bump template version (1.3.1)
  change circleci node image to 6.12.3 to ensure node 6 compat.
  replace object rest spread with Object.assign for node6 compat. (fix
vuejs-templates#1245)
  bump template version (1.3.0)
  chore: remove extra comma (vuejs-templates#1240)
  Improve template CI tests (close vuejs-templates#1218)
  Revert "fix bad alias (fix vuejs-templates#1239)"
  Typo, whitespace and Style Guide fixes (vuejs-templates#1231)
  Update runner.js (vuejs-templates#1235)
  remove unnecessary option.
  bumping eslint dependencies
  fix bad alias (fix vuejs-templates#1239)
  fix history fallback for windows.
  remove duplicate lines in gitignore (vuejs-templates#1214)
  fix historyFallback rewrite for Windows systems
  improved comments in eslintrc
  updated linting docs.
  respect eslint rule for order of options.
  switch to essential ruleset.
  add eslint-plugin-vue
  ...

# Conflicts:
#	meta.js
#	template/package.json
#	template/src/components/HelloWorld.vue
#	template/src/main.js
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.