From 7b00ca4ea08b6a5b124dede6cb7f5b0af1d57a4a Mon Sep 17 00:00:00 2001 From: ibnAbuMahdi Date: Thu, 25 Aug 2022 19:35:24 -0700 Subject: [PATCH] cool --- 0x01-git/bash/alx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/0x01-git/bash/alx b/0x01-git/bash/alx index fb9a186..804eb7a 100644 --- a/0x01-git/bash/alx +++ b/0x01-git/bash/alx @@ -1,6 +1,4 @@ #!/bin/bash -<<<<<<< HEAD echo "ALX School is so cool!" -======= -echo "ALX School is so cool!" ->>>>>>> master + +