From 71b87afb73032b9510240d768285cba8a6612792 Mon Sep 17 00:00:00 2001 From: erinw Date: Mon, 19 Aug 2024 09:49:14 -0400 Subject: [PATCH] resolve merge conflict --- src/js/components/Ballot/BallotTitleHeader.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/js/components/Ballot/BallotTitleHeader.jsx b/src/js/components/Ballot/BallotTitleHeader.jsx index 1f1598e31..83752f39a 100644 --- a/src/js/components/Ballot/BallotTitleHeader.jsx +++ b/src/js/components/Ballot/BallotTitleHeader.jsx @@ -208,7 +208,6 @@ class BallotTitleHeader extends Component { onClick={this.showSelectBallotModalEditAddress} > {(textForMapSearch && textForMapSearch !== '') ? textForMapSearch : originalTextAddress} - {linksOff ? <> : editIconStyled}