From 5e2103faebf3a3a16331ba26e657df7f2e497d97 Mon Sep 17 00:00:00 2001
From: AfonsoSantos96 <afomms@gmail.com>
Date: Thu, 18 May 2023 10:31:35 +0100
Subject: [PATCH] feat(HIS): add HIS script into makefile python scripts

Signed-off-by: Afonso Santos <afomms@gmail.com>
---
 his_checker.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/his_checker.py b/his_checker.py
index 9f2a17d..e86059a 100755
--- a/his_checker.py
+++ b/his_checker.py
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #!/bin/python3
 
 # SPDX-License-Identifier: Apache-2.0
@@ -215,3 +216,7 @@ def process_v_g(files, threshold):
     # If there were any failures, exit with an error code
     if CHECK_FAIL:
         sys.exit(-1)
+=======
+
+# wip
+>>>>>>> 6e30066 (feat(HIS): add HIS script into makefile python scripts)