Skip to content

Commit

Permalink
Merge branch '016/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeffrey Horn committed Jan 18, 2017
2 parents 47696ec + 3303f1d commit a7b7dcc
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@
<head>
<title>Example</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<script src="vendor.bundle.js" type="text/javascript" charset="utf-8" defer></script>
<script src="bundle.js" type="text/javascript" charset="utf-8" defer></script>

<!-- Do not add `link` tags unless you know what you are doing -->
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">

<!-- Do not add `script` tags unless you know what you are doing -->
<script src="public/vendor.js" type="text/javascript" charset="utf-8" defer></script>
<script src="public/application.js" type="text/javascript" charset="utf-8" defer></script>
</head>
<body class="container-fluid">
<div class="half">
Expand Down

0 comments on commit a7b7dcc

Please sign in to comment.