merge bien hecho
This commit is contained in:
parent
00c8fb455f
commit
5c9f7fd04e
|
@ -10,19 +10,16 @@
|
|||
<body>
|
||||
<div id="app">
|
||||
{{1+1}}
|
||||
<<<<<<< HEAD
|
||||
<div ui-view></div>
|
||||
<a ui-sref="index">index</a>
|
||||
<a ui-sref="add">add</a>
|
||||
<a ui-sref="edit">edit</a>
|
||||
<a ui-sref="delete">delete</a>
|
||||
=======
|
||||
<vn-button text="texto del boton"></vn-button><br>
|
||||
<vn-check text="texto del text" ></vn-check><br>
|
||||
<vn-radio text="texto del radio"></vn-radio><br>
|
||||
<vn-textfield text="prueba" type="email"></vn-textfield><br>
|
||||
<vn-txt text="hola mundo"></vn-txt>
|
||||
>>>>>>> f1a3e2dd5837c6b7a66486b5566e422ca10a8399
|
||||
</div>
|
||||
<script type="text/javascript" src="build/salix.app.js" selector="#app"></script>
|
||||
<script defer src="https://code.getmdl.io/1.2.1/material.min.js"></script>
|
||||
|
|
Loading…
Reference in New Issue