This repository was archived by the owner on Sep 25, 2023. It is now read-only.

Commit dd10748

committed

merge

2 parents 0f7ceae + 3c46622 commit dd10748Copy full SHA for dd10748

File tree

+65

-0

lines changed

+65

-0

lines changed

Lines changed: 40 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,44 @@`
	`1`	`+<<<<<<< HEAD`
`1`	`2`	`.DS_Store`
`2`	`3`	`node_modules/`
`3`	`4`	`dist/`
`4`	`5`	`npm-debug.log`
	`6`	`+=======`
	`7`	`+# Logs`
	`8`	`+logs`
	`9`	`+*.log`
	`10`	`+npm-debug.log*`
	`11`	`+`
	`12`	`+# Runtime data`
	`13`	`+pids`
	`14`	`+*.pid`
	`15`	`+*.seed`
	`16`	`+`
	`17`	`+# Directory for instrumented libs generated by jscoverage/JSCover`
	`18`	`+lib-cov`
	`19`	`+`
	`20`	`+# Coverage directory used by tools like istanbul`
	`21`	`+coverage`
	`22`	`+`
	`23`	`+# nyc test coverage`
	`24`	`+.nyc_output`
	`25`	`+`
	`26`	`+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)`
	`27`	`+.grunt`
	`28`	`+`
	`29`	`+# node-waf configuration`
	`30`	`+.lock-wscript`
	`31`	`+`
	`32`	`+# Compiled binary addons (http://nodejs.org/api/addons.html)`
	`33`	`+build/Release`
	`34`	`+`
	`35`	`+# Dependency directories`
	`36`	`+node_modules`
	`37`	`+jspm_packages`
	`38`	`+`
	`39`	`+# Optional npm cache directory`
	`40`	`+.npm`
	`41`	`+`
	`42`	`+# Optional REPL history`
	`43`	`+.node_repl_history`
	`44`	`+>>>>>>> 3c4662203307bf807ffa05497d28271c053497f9`

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,21 @@`
	`1`	`+The MIT License (MIT)`
	`2`	`+`
	`3`	`+Copyright (c) 2016 brandonxiang`
	`4`	`+`
	`5`	`+Permission is hereby granted, free of charge, to any person obtaining a copy`
	`6`	`+of this software and associated documentation files (the "Software"), to deal`
	`7`	`+in the Software without restriction, including without limitation the rights`
	`8`	`+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell`
	`9`	`+copies of the Software, and to permit persons to whom the Software is`
	`10`	`+furnished to do so, subject to the following conditions:`
	`11`	`+`
	`12`	`+The above copyright notice and this permission notice shall be included in all`
	`13`	`+copies or substantial portions of the Software.`
	`14`	`+`
	`15`	`+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR`
	`16`	`+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,`
	`17`	`+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE`
	`18`	`+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER`
	`19`	`+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,`
	`20`	`+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE`
	`21`	`+SOFTWARE.`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,3 +16,7 @@ npm run build`
`16`	`16`	```
`17`	`17`
`18`	`18`	`For detailed explanation on how things work, consult the [docs for vue-loader](http://vuejs.github.io/vue-loader).`
	`19`	`+=======`
	`20`	`+# example-vue-webpack`
	`21`	`+An example for vue and webpack`
	`22`	`+>>>>>>> 3c4662203307bf807ffa05497d28271c053497f9`

Comments

(0)