From 51c60d4d349c66432e57255f459c3d175ac3b251 Mon Sep 17 00:00:00 2001
From: Jenny Yu <jennyyu212@outlook.com>
Date: Wed, 15 Jun 2022 18:19:36 -0700
Subject: fix merge conflicts

---
 src/client/views/DashboardView.tsx | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/client')

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>
-- 
cgit v1.2.3-70-g09d2