resolve conflicts

Author: DrPsychick

smc.c

@@ -490,8 +490,8 @@ int main(int argc, char* argv[])
             printf("  -a       Display ambient temperature.\n");
             printf("  -f       Display fan speeds.\n");
             printf("  -A       Display all SMC keys")
-            printf("  -t key   Display temperature of given SMC key");
-            printf("  -r key   Display raw value of given SMC key");
+            printf("  -t key   Display temperature of given SMC key\n");
+            printf("  -r key   Display raw value of given SMC key\n");
             printf("  -h       Display this help.\n");
             printf("\nIf more than one of -c, -f, or -g are specified, titles will be added\n");
             return -1;