From 39b123c6410a4d750ec3705171c164a9811ea861 Mon Sep 17 00:00:00 2001 From: tTh Date: Fri, 24 Mar 2023 15:34:23 +0100 Subject: [PATCH] krkrkr bis --- tools/read_obj.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tools/read_obj.c b/tools/read_obj.c index 4178ba1..9f1735d 100644 --- a/tools/read_obj.c +++ b/tools/read_obj.c @@ -20,13 +20,8 @@ if (2 != argc) { verbosity = 1; -<<<<<<< HEAD -foo = try_to_read_an_OBJ_file(argv[1], "bulles.xyz", 0); -fprintf(stderr, "try to read '%s' --> %d\n", argv[1], foo); -======= foo = try_to_read_an_OBJ_file(argv[1], "bubulles.asc", 0); -fprintf(stderr, "try to read -> %d\n", foo); ->>>>>>> 457afac7c0a208413ff6a7f1d0932da76ecf685b +fprintf(stderr, "try to read '%s' -> %d\n", argv [1], foo); return 0; }