From c380dce846da18d458ec9aae311a918817c812b0 Mon Sep 17 00:00:00 2001
From: Pantelis Sopasakis <alphaville@users.noreply.github.com>
Date: Fri, 3 Feb 2023 09:18:18 +0000
Subject: [PATCH] Update README.md

Removed <<<<<<< HEAD (git conflict)
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 0acd35f..1515ea9 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,7 @@ You will need uncommend the line in `DueTimer.h` in `DueTimer` folder inside the
 
 ### You don't need to know:
 
-<<<<<<< HEAD
+
 - `int timer` - Stores the object timer id (to access Timers struct array).
 
 - `DueTimer(unsigned short _timer)` - Instantiate a new DueTimer object for Timer _timer (NOTE: All objects are already instantiated!).
@@ -123,4 +123,4 @@ You will need uncommend the line in `DueTimer.h` in `DueTimer` folder inside the
 ### Hardware Information
 
 More information on the Timer Counter module of the µC on the Arduino Due
-can be found in the documentation file [TimerCounter](TimerCounter.md).
\ No newline at end of file
+can be found in the documentation file [TimerCounter](TimerCounter.md).