Merge remote-tracking branch 'origin/main'

nschlimm · nschlimm · commit b05723589edf · 2024-04-17T11:07:35.000+02:00
diff --git a/EasyKey.git/ezk-git-functions.sh b/EasyKey.git/ezk-git-functions.sh
@@ -102,7 +102,7 @@ function mergeChanges () {
         fi
     fi
 }
-
+ 
 function commitChanges () {
     importantLog "Checking for stuff to commit from the working tree"
     if git status -s -uno| grep -q ".*"; then

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ function mergeChanges () {`
`102`	`102`	`fi`
`103`	`103`	`fi`
`104`	`104`	`}`
`105`		`-`
	`105`	`+`
`106`	`106`	`function commitChanges () {`
`107`	`107`	`importantLog "Checking for stuff to commit from the working tree"`
`108`	`108`	`if git status -s -uno\| grep -q ".*"; then`