forked from freudenreichan/info2Praktikum-NeuronalesNetz
Merge branch 'main' of https://git.efi.th-nuernberg.de/gitea/turtschinba100320/info2Praktikum-NeuronalesNetzBastiBjoern
This commit is contained in:
commit
225dbac29f
8
main.c
8
main.c
@ -7,7 +7,11 @@
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
//readImages("mnist_test.info2");
|
||||
=======
|
||||
readImages("mnist_test.info2");
|
||||
>>>>>>> a031bb0b7ae2ed27acbc26a3e70ad41c093e63d2
|
||||
|
||||
const unsigned int windowWidth = 800;
|
||||
const unsigned int windowHeight = 600;
|
||||
@ -69,4 +73,8 @@ int main(int argc, char *argv[])
|
||||
|
||||
return exitCode;
|
||||
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
=======
|
||||
}
|
||||
>>>>>>> a031bb0b7ae2ed27acbc26a3e70ad41c093e63d2
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user