approvals.bash: Ignore trailing CR & whitespace

Signed-off-by: Filip Gołaś <[email protected]>
Dasharo · Oct 15, 2024 · 7e4982c · 7e4982c
1 parent 7d4717c
commit 7e4982c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/test/approvals.bash b/test/approvals.bash
@@ -32,12 +32,8 @@ approve() {
     return
   fi
 
-<<<<<<< HEAD
-  if [[ "$(printf "%b" "$actual")" = "$(printf "%b" "$expected")" ]]; then
-=======
   $diff_cmd <(printf "%b" "$expected\n") <(printf "%b" "$actual\n") &> /dev/null && true
   if [[ $? == 0 ]]; then
->>>>>>> dd9111f1f354 (ci fixes)
     pass "$cmd"
   else
     printf -- "$changed_diff_string\n" "$cmd"