fix editor highlighter

rebasing
4 years ago · 50ea6b8649
parent 22701060ff
commit 50ea6b8649
1 changed files with 3 additions and 0 deletions
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@ -326,7 +326,10 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
    <div className="analysis_3ECCBV px-3 pb-1">
      <div className="my-2 d-flex flex-column align-items-left">
        <div className="d-flex justify-content-between" id="staticanalysisButton">
+<<<<<<< HEAD
        <div className="d-flex justify-content-between">
+=======
+>>>>>>> 691f449c6 (fix editor highlighter)
          <RemixUiCheckbox
            id="checkAllEntries"
            inputType="checkbox"