Merge master

2016-11-06 20:05:11 +11:00 · 2016-11-06 20:05:11 +11:00 · ec830128c8
parent b00928aeb6
commit ec830128c8
1 changed files with 0 additions and 1 deletions
--- a/1
+++ b/1
@ -839,7 +839,6 @@ getcpu() {
            cores="$(sysinfo -cpu | grep -c -F 'CPU #')"
        ;;
    esac
->>>>>>> df2ecf9f4fd077872037c3d3a7e558fa0871b5fa

    # Format the output
    case "$os" in