From 5bca8553188663f56c6095674492cbfd304960d2 Mon Sep 17 00:00:00 2001
From: yanis60 <30592254+yanis60@users.noreply.github.com>
Date: Sat, 22 Jun 2024 13:56:10 +0100
Subject: [PATCH] updated CMAKELIST

---
 .vscode/settings.json | 5 +++++
 CMakeLists.txt        | 5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..0589549
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "githubPullRequests.ignoredPullRequestBranches": [
+        "master"
+    ]
+}
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 94c238c..ea21789 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,10 +2,7 @@ cmake_minimum_required(VERSION 3.14)
 project(limereport)
 
 set(LIMEREPORT_VERSION_MAJOR 1)
-<<<<<<< HEAD
-set(LIMEREPORT_VERSION_MINOR 6)
-set(LIMEREPORT_VERSION_RELEASE 8)
-=======
+
 set(LIMEREPORT_VERSION_MINOR 7)
 set(LIMEREPORT_VERSION_RELEASE 7)
 >>>>>>> b4b2da83307b17610728ba18fba062abc897edc0