From: lukel495 Date: Sat, 11 Nov 2023 14:34:50 +0000 (+0100) Subject: fixade en konflikt i testfilen X-Git-Url: https://gitweb.forssennils.se/?a=commitdiff_plain;h=5731ae3d2f31c87cafeeb24f2b650b1bf79ae558;p=TDDC76_proj.git fixade en konflikt i testfilen --- diff --git a/src/_test.cc b/src/_test.cc index bffea24..67ed969 100644 --- a/src/_test.cc +++ b/src/_test.cc @@ -34,7 +34,7 @@ int main() /* ladda in en texture (bild) */ Texture texture; - if (!texture.loadFromFile("4V_figur2.png")) + if (!texture.loadFromFile("assets/4V_figur2.png")) { // gick inte att ladda bilden return 1;