冲突修改

Signed-off-by: zhutianyi <zhutianyi2@huawei.com>

services/timer/include/timer_manager.h

@@ -88,6 +88,7 @@ private:
     std::shared_ptr<Batch> FindFirstWakeupBatchLocked();
     void SetLocked(int type, std::chrono::nanoseconds when);
     std::chrono::steady_clock::time_point ConvertToElapsed(std::chrono::milliseconds when, int type);
+    std::chrono::steady_clock::time_point GetBootTimeNs();
     void CallbackAlarmIfNeed(std::shared_ptr<TimerInfo> alarm);
 
     std::map<uint64_t, std::shared_ptr<TimerEntry>> timerEntryMap_;