From 430e9113a57f5ab4372a00b52107f139f88dccd5 Mon Sep 17 00:00:00 2001
From: evilsocket <evilsocket@gmail.com>
Date: Sat, 24 Feb 2018 18:50:33 +0100
Subject: [PATCH] misc: small fix or general refactoring i did not bother
 commenting

---
 changelog.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.sh b/changelog.sh
index bac6419c..c993dd6d 100755
--- a/changelog.sh
+++ b/changelog.sh
@@ -20,7 +20,7 @@ for LINE in "${LINES[@]}"; do
     elif [[ $LINE = *"fix:"* ]]; then
         LINE=$(echo "$LINE" | sed -E "s/^fix: //")
         FIXES+=("$LINE") 
-    elif [[ $LINE != *"i did not bother commenting"* ]]; then 
+    elif [[ $LINE != *"i did not bother commenting"* ]] && [[ $LINE != *"Merge "* ]]; then 
         echo "MISC LINE =$LINE"
         LINE=$(echo "$LINE" | sed -E "s/^[a-z]+: //")
         MISC+=("$LINE")