PolyPaw/habitica-sync
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/SuperChamp234/habitica-sync into dev

Browse source
This commit is contained in:
ransurf 2021-11-20 23:40:02 -08:00
commit dfc4e55cb5
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/view/App.tsx
View file

@ -195,8 +195,12 @@ class App extends React.Component<any, any> {
return (<div className="plugin-root">
{content}
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
<<<<<<< HEAD
<Taskview data={this.state.tasks} handleChangeTodos={this.handleChangeTodos} settings = {this.props.plugin.settings} handleChangeDailys={this.handleChangeDailys} handleChangeHabits={this.handleChangeHabits} handleChangeRewards={this.handleChangeRewards}/>
<div></div>
=======
<Taskview data={this.state.tasks} handleChangeTodos={this.handleChangeTodos} handleChangeDailys={this.handleChangeDailys} handleChangeHabits={this.handleChangeHabits} handleChangeRewards={this.handleChangeRewards}/>
>>>>>>> 54e6000eb8811968a7e3082a4995c6e40f96654e
<Statsview user_data={this.state.user_data} />
</div>
);