Skip to content

Commit 0e8fa5d

Browse files
author
Ari
committed
Resolve merge conflict
2 parents 402ca69 + b56875c commit 0e8fa5d

33 files changed

+807
-402
lines changed

‎.eslintrc.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@ module.exports = {
44
node: true
55
},
66
extends: [
7-
'plugin:vue/essential',
7+
'plugin:vue/recommended',
88
'@vue/standard'
99
],
1010
rules: {
1111
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
1212
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
1313
indent: ['error', 4],
14-
'space-before-function-paren': ['warn', 'never']
14+
'space-before-function-paren': ['warn', 'never'],
15+
'vue/require-default-prop': 'off',
16+
'vue/no-v-html': 'off',
17+
'vue/html-indent': ['error', 4]
1518
},
1619
parserOptions: {
1720
parser: 'babel-eslint'

‎docs/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><link rel=icon type=image/png href=https://d15omoko64skxi.cloudfront.net/wp-content/uploads/2016/05/cc-site-icon-300x300.png sizes=192x192><link rel=apple-touch-icon-precomposed href=https://d15omoko64skxi.cloudfront.net/wp-content/uploads/2016/05/cc-site-icon-300x300.png><meta name=twitter:card content=summary><meta name=twitter:site content=@creativecommons><meta name=twitter:creator content=@creativecommons><meta property=og:url content=https://beta-chooser.creativecommons.org><meta property=og:title content="Choose a License"><meta property=og:type content=website><meta property=og:description content="Want to license your work with Creative Commons, but not sure where to start, or which license is right for you? Use our license chooser!"><meta property=og:image content=https://mirrors.creativecommons.org/presskit/logos/cc.logo.large.png><meta property=og:locale content=en_US><meta property=og:locale:alternate content=ru_RU><title>Choose a License</title><link href=/css/app.3d055f7e.css rel=preload as=style><link href=/css/chunk-vendors.897a4b6f.css rel=preload as=style><link href=/js/app.66ee6643.js rel=preload as=script><link href=/js/chunk-vendors.fe161d12.js rel=preload as=script><link href=/css/chunk-vendors.897a4b6f.css rel=stylesheet><link href=/css/app.3d055f7e.css rel=stylesheet></head><body><noscript><strong>We're sorry but License Chooser doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.fe161d12.js></script><script src=/js/app.66ee6643.js></script></body></html>
1+
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><link rel=icon type=image/png href=https://d15omoko64skxi.cloudfront.net/wp-content/uploads/2016/05/cc-site-icon-300x300.png sizes=192x192><link rel=apple-touch-icon-precomposed href=https://d15omoko64skxi.cloudfront.net/wp-content/uploads/2016/05/cc-site-icon-300x300.png><meta name=twitter:card content=summary><meta name=twitter:site content=@creativecommons><meta name=twitter:creator content=@creativecommons><meta property=og:url content=https://beta-chooser.creativecommons.org><meta property=og:title content="Choose a License"><meta property=og:type content=website><meta property=og:description content="Want to license your work with Creative Commons, but not sure where to start, or which license is right for you? Use our license chooser!"><meta property=og:image content=https://mirrors.creativecommons.org/presskit/logos/cc.logo.large.png><meta property=og:locale content=en_US><meta property=og:locale:alternate content=ru_RU><title>Choose a License</title><link href=/css/app.3d055f7e.css rel=preload as=style><link href=/css/chunk-vendors.897a4b6f.css rel=preload as=style><link href=/js/app.8fee9f02.js rel=preload as=script><link href=/js/chunk-vendors.ed0909f1.js rel=preload as=script><link href=/css/chunk-vendors.897a4b6f.css rel=stylesheet><link href=/css/app.3d055f7e.css rel=stylesheet></head><body><noscript><strong>We're sorry but License Chooser doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.ed0909f1.js></script><script src=/js/app.8fee9f02.js></script></body></html>

‎docs/js/app.66ee6643.js‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎docs/js/app.66ee6643.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docs/js/app.8fee9f02.js‎

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

‎docs/js/app.8fee9f02.js.map‎

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

‎docs/js/chunk-vendors.ed0909f1.js‎

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

‎docs/js/chunk-vendors.ed0909f1.js.map‎

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

‎docs/js/chunk-vendors.fe161d12.js‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎docs/js/chunk-vendors.fe161d12.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)