2016-09-29 05:10:58 +00:00
|
|
|
<!doctype html>
|
|
|
|
|
<html>
|
2016-10-05 05:55:53 +00:00
|
|
|
|
|
|
|
|
<head>
|
|
|
|
|
<title>Salix</title>
|
|
|
|
|
</head>
|
|
|
|
|
<body>
|
|
|
|
|
<div id="app">
|
|
|
|
|
{{1+1}}
|
2016-09-29 09:04:11 +00:00
|
|
|
</div>
|
2016-10-05 06:03:43 +00:00
|
|
|
<<<<<<< HEAD
|
2016-10-05 05:55:53 +00:00
|
|
|
<script type="text/javascript" src="build/salix.app.js" selector="#app"></script>
|
|
|
|
|
</body>
|
2016-10-05 06:03:43 +00:00
|
|
|
</html>
|
|
|
|
|
=======
|
2016-09-29 05:10:58 +00:00
|
|
|
<body>
|
2016-09-29 09:04:11 +00:00
|
|
|
<script type="text/javascript" src="build/salix.core.js"></script>
|
2016-09-29 05:10:58 +00:00
|
|
|
<script type="text/javascript" src="build/salix.app.js"></script>
|
|
|
|
|
</body>
|
|
|
|
|
</html>
|
2016-10-05 06:03:43 +00:00
|
|
|
>>>>>>> 123932ba64bf824cbdc2bd9fe04663b2e539eea3
|
