From b4aec718a58950c197bd9d310b91d20d26eeeda4 Mon Sep 17 00:00:00 2001
From: K <5229241+Krasjet@users.noreply.github.com>
Date: Thu, 7 Jul 2022 19:31:05 -0400
Subject: [PATCH] fix merge typo in Locator_Time() (#380)

---
 implot.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/implot.cpp b/implot.cpp
index 5f372f6..5723ae6 100644
--- a/implot.cpp
+++ b/implot.cpp
@@ -1229,7 +1229,7 @@ void Locator_Time(ImPlotTicker& ticker, const ImPlotRange& range, float pixels,
                 ftd.Time = t1; ftd.Spec = fmt0;
                 ticker.AddTick(t1.ToDouble(), true, 0, true, Formatter_Time, &ftd);
                 // major level 1 tick
-                ftd.Time = t1; ftd.Spec = last_major_offset < 0 == NULL ? fmtf : fmt1;
+                ftd.Time = t1; ftd.Spec = last_major_offset < 0 ? fmtf : fmt1;
                 ImPlotTick& tick_maj = ticker.AddTick(t1.ToDouble(), true, 1, true, Formatter_Time, &ftd);
                 const char* this_major = ticker.GetText(tick_maj);
                 if (last_major_offset >= 0 && TimeLabelSame(ticker.TextBuffer.Buf.Data + last_major_offset, this_major))