skuska

cv1/program.c

@@ -3,6 +3,7 @@
 int main() {
     int text;
 
+<<<<<<< HEAD
     while ((text = getchar()) != EOF) {
         if (text >= 'a' && text <= 'z') {
             text = text - 'a' + 'A';
@@ -14,6 +15,10 @@ int main() {
         } else if (text < 32 || text == 127) {
             continue;
         }
+=======
+	printf("hello world\n");
+	return 1;
+>>>>>>> ae41227d7eccd9cfc8364f26b732c73f151b6d66
 
         putchar(text);
     }