feat(HIS): add HIS script into makefile python scripts

Signed-off-by: Afonso Santos <[email protected]>
bao-project · Mar 7, 2024 · 5e2103f · 5e2103f
1 parent 4a2edbb
commit 5e2103f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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)