ascribe
/
onion
mirror of https://github.com/ascribe/onion.git
1
0
Fork 0
Code Issues Releases Wiki Activity

resolve conflict

This commit is contained in:
Tim Daubenschütz 2015-05-20 11:25:17 +02:00
parent 06d0b7abe6 21e9216540
commit 148b019ff9
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
index.html
View File

@ -8,7 +8,10 @@
<link ref="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css"></link>
</head>
<body>
<div id="main"></div>
<div id="main" class="container-fluid"></div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
<script src="build/app.js"></script>
</body>
</html>

2
js/alt.js
View File

@ -1,3 +1,3 @@
import Alt from 'alt';
export default new Alt();
export default new Alt();

1
js/app.js
View File

@ -6,6 +6,7 @@ import Router from 'react-router';
import AscribeApp from './components/ascribe_app';
import routes from './routes';
Router.run(routes, Router.HashLocation, (AscribeApp) => {
React.render(
<AscribeApp />,