Permalink
Browse files

fix conflicts

  • Loading branch information...
taylorotwell committed Aug 22, 2018
2 parents ff99e2f + 289b145 commit 0c627804026968fb52bc5fd66d3e03de06bfb4f7
Showing with 8 additions and 4 deletions.
  1. +1 −0 .gitignore
  2. +1 −1 package.json
  3. +2 −0 readme.md
  4. +4 −3 resources/views/welcome.blade.php
View
@@ -11,3 +11,4 @@ Homestead.yaml
npm-debug.log
yarn-error.log
.env
.phpunit.result.cache
View
@@ -15,7 +15,7 @@
"cross-env": "^5.1",
"jquery": "^3.2",
"laravel-mix": "^2.0",
"lodash": "^4.17.4",
"lodash": "^4.17.5",
"popper.js": "^1.12",
"vue": "^2.5.7"
}
View
@@ -49,6 +49,8 @@ We would like to extend our thanks to the following sponsors for helping fund on
- [WebL'Agence](https://weblagence.com/)
- [Invoice Ninja](https://www.invoiceninja.com)
- [iMi digital](https://www.imi-digital.de/)
- [Earthlink](https://www.earthlink.ro/)
- [Steadfast Collective](https://steadfastcollective.com/)
## Contributing
@@ -8,15 +8,15 @@
<title>Laravel</title>
<!-- Fonts -->
<link href="https://fonts.googleapis.com/css?family=Raleway:100,600" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet" type="text/css">
<!-- Styles -->
<style>
html, body {
background-color: #fff;
color: #636b6f;
font-family: 'Raleway', sans-serif;
font-weight: 100;
font-family: 'Nunito', sans-serif;
font-weight: 200;
height: 100vh;
margin: 0;
}
@@ -86,6 +86,7 @@
<a href="https://laravel.com/docs">Documentation</a>
<a href="https://laracasts.com">Laracasts</a>
<a href="https://laravel-news.com">News</a>
<a href="https://nova.laravel.com">Nova</a>
<a href="https://forge.laravel.com">Forge</a>
<a href="https://github.com/laravel/laravel">GitHub</a>
</div>

0 comments on commit 0c62780

Please sign in to comment.