ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 17:33:14 +01:00
Code Issues Releases Wiki Activity

resolve merge conflict

Browse Source
This commit is contained in:
Tim Daubenschütz 2015-05-20 15:23:15 +02:00
commit f4700e9842
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/components/ascribe_app.js
View File

@ -6,7 +6,7 @@ let Link = Router.Link;
let RouteHandler = Router.RouteHandler;
class AscribeApp extends React.Component {
let AscribeApp = React.createClass({
render() {
return (
<div>
@ -18,6 +18,6 @@ class AscribeApp extends React.Component {
</div>
);
}
};
});
export default AscribeApp;

0
js/components/header.js Normal file
View File