From b14ea9624b0816efb59c98e993cfd81d9ae4fab6 Mon Sep 17 00:00:00 2001
From: Simeon Ehrig <s.ehrig@hzdr.de>
Date: Wed, 20 Sep 2023 11:41:27 +0200
Subject: [PATCH] make format_all.jl path independent (#17)

Before the format_all.jl script needs to be execute from the project
root directory. Now the script can be executed from every directory
path.
---
 .formatting/format_all.jl | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.formatting/format_all.jl b/.formatting/format_all.jl
index b9b8ba7..c1198a5 100644
--- a/.formatting/format_all.jl
+++ b/.formatting/format_all.jl
@@ -1,13 +1,9 @@
 using JuliaFormatter
 
-<<<<<<< HEAD
 # we asume the format_all.jl script is located in QEDbase.jl/.formatting
 project_path = Base.Filesystem.joinpath(Base.Filesystem.dirname(Base.source_path()), "..")
 
 not_formatted = format(project_path; verbose=true)
-=======
-not_formatted = format(pwd(); verbose=true)
->>>>>>> baec5cc (Enhancement for the gitlab-ci)
 if not_formatted
     @info "Formatting verified."
 else