Merge branch 'master' of https://github.com/Fabian42/bash_scripts

Fabian42 · Dec 18, 2023 · 8825afb · 8825afb
2 parents c57f6d3 + fc3fcb6
commit 8825afb
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/temp.json b/temp.json
@@ -1,6 +1,4 @@
 {"keywords":[
-<<<<<<< HEAD
-=======
  {"keyword":"test"},
  {"keyword":"abc"},
  {"keyword":"foo"},
@@ -9,5 +7,4 @@
  {"keyword":"\\\# hash"},
  {"keyword":"\\\\"},
  {"keyword":"\\\\\# hashtesting"}
->>>>>>> 4d781ad2c9a562e693caf5d259f933c8c575ff21
 ]}