du1/program.c

@@ -10,7 +10,6 @@ struct pizza {
 };
 
 
-<<<<<<< HEAD
 void deshifr (char *text) {
    for (int i = 0; text[i] != '\0'; i++) {
       switch (text[i]) {
@@ -47,20 +46,6 @@ void deshifr (char *text) {
       }
       text[i] = tolower(text[i]);
    }
-=======
-   struct pizza {
-      float prize;
-      char name[LINESIZE];
-   };
-
-
-
-int main() {
-
-struct pizza nulova;
-struct pizza tuniakova;
-return 0;
->>>>>>> fd498cb (refresh)
 }
 
 int search_string (const char* heap_orig, const char* needle_orig) {

du2/program.c

@@ -1,41 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#define LINE_SIZE 100
-
-struct pizza {
-   char name [LINE_SIZE];
-   float prize;
-};
-
-int read_pizza (struct pizza* list) {
-
-int n = 0;
-char line[200];
-
-while (1) {
-   if (fgets(line, sizeof(line), stdin)==NULL) { 
-      break;
-   }
-   line[strcspn(line, "\n")] = '\0';
-      if (strlen(line) == 0) {
-         break;
-      }
-   strcpy(list[n].name, line);
-   if (fgets(line, sizeof(line), stdin)==NULL) {
-      break;
-      }
- if (scanf(line, "%f", &list[n].prize) !=1) {
-      break;
-      }
-   n++;
-   }
-return n;
-}
-
-
-
-
-int main() {
-return 0;
-}