                      ((1515334380.0 . 1515338220.0)
                       (1515423600.0 . 1515424500.0)))))))
 
+
++
+;; Conflict resolution tests
+
 (ert-deftest timeline-tools-test-clockline-no-conflict-1 ()
   "Test `timeline-tools-clockline-no-conflict’ with complex example."
   (with-temp-buffer

:LOGBOOK:
:END:
"))))

(require 'timeline-tools)
(require 'cl-lib)

;; Basic parsing tests

(ert-deftest timeline-tools-test-parse-clocklines-1 ()
  "Test `timeline-tools-clocklines-in-range’ with simple setup."
