Merge master

ec830128 · Dylan Araps · b00928ae · ec830128
Commit ec830128 authored Nov 06, 2016 by Dylan Araps
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

neofetch neofetch +0 -1

No files found.
--- a/neofetch
+++ b/neofetch
@@ -839,7 +839,6 @@ getcpu() {
            cores="$(sysinfo -cpu | grep -c -F 'CPU #')"
        ;;
    esac
->>>>>>> df2ecf9f4fd077872037c3d3a7e558fa0871b5fa

    # Format the output
    case "$os" in