skuska

cv1/program.c

@@ -2,27 +2,22 @@
 
 int main() {
     int text;
+    int lines_count = 0;
 
-<<<<<<< HEAD
     while ((text = getchar()) != EOF) {
         if (text >= 'a' && text <= 'z') {
             text = text - 'a' + 'A';
         } else if (text >= 'A' && text <= 'Z') {
             text = text - 'A' + 'a';
         } else if (text == '\n') {
-            printf("\n");
-            continue;
+            lines_count++;
         } else if (text < 32 || text == 127) {
             continue;
         }
-=======
-	printf("hello world\n");
-	return 1;
->>>>>>> ae41227d7eccd9cfc8364f26b732c73f151b6d66
 
         putchar(text);
     }
 
-    printf("\nPocet riadkov: 1\n"); 
+    printf("\nLines count: %d\n", lines_count);
     return 0;
 }