diff options
| author | Jenny Yu <jennyyu212@outlook.com> | 2022-06-15 18:19:36 -0700 |
|---|---|---|
| committer | Jenny Yu <jennyyu212@outlook.com> | 2022-06-15 18:19:36 -0700 |
| commit | 51c60d4d349c66432e57255f459c3d175ac3b251 (patch) | |
| tree | 1642676627e56d7a1ed386f78ba2c653b2981afd | |
| parent | 4dc671172aab070e951b8b9c7e642a1b4a8a1fbd (diff) | |
fix merge conflicts
| -rw-r--r-- | src/client/views/DashboardView.tsx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/client/views/DashboardView.tsx b/src/client/views/DashboardView.tsx index c7631da84..716653ea5 100644 --- a/src/client/views/DashboardView.tsx +++ b/src/client/views/DashboardView.tsx @@ -121,14 +121,10 @@ export class DashboardView extends React.Component { <img src={href ?? "https://media.istockphoto.com/photos/hot-air-balloons-flying-over-the-botan-canyon-in-turkey-picture-id1297349747?b=1&k=20&m=1297349747&s=170667a&w=0&h=oH31fJty_4xWl_JQ4OIQWZKP8C6ji9Mz7L4XmEnbqRU="}></img> <div className="info"> <div className="title"> {StrCast(dashboard.title)} </div> -<<<<<<< HEAD - <div className="more" onClick={this.showContextMenu} onContextMenu={this.onContextMenu}> -======= <div className="more" onPointerDown={e => { this._downX = e.clientX; this._downY = e.clientY; }} onClick={this.onContextMenu}> ->>>>>>> 1bb2772ee619e29ebd800192eb3df69dc0f38205 <FontAwesomeIcon color="black" size="lg" icon="bars" /> </div> </div> |