From ec830128c89c5288a34dbcf152165c9563d97af4 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Sun, 6 Nov 2016 20:05:11 +1100
Subject: [PATCH] Merge master

---
 neofetch | 1 -
 1 file changed, 1 deletion(-)

diff --git a/neofetch b/neofetch
index ad361d42..24f330cc 100755
--- a/neofetch
+++ b/neofetch
@@ -839,7 +839,6 @@ getcpu() {
             cores="$(sysinfo -cpu | grep -c -F 'CPU #')"
         ;;
     esac
->>>>>>> df2ecf9f4fd077872037c3d3a7e558fa0871b5fa
 
     # Format the output
     case "$os" in