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

Fixed merge conflict error made by Ran lol

Browse source
This commit is contained in:
Zain 2021-11-21 13:18:07 +05:30
parent dfc4e55cb5
commit 6865d4f080
No known key found for this signature in database
GPG key ID: 84AD8F072D45C37F
1 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/view/App.tsx
View file

@ -195,12 +195,7 @@ class App extends React.Component<any, any> {
return (<div className="plugin-root"> return (<div className="plugin-root">
{content} {content}
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" /> <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}/> <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} /> <Statsview user_data={this.state.user_data} />
</div> </div>
); );