mirror of
https://github.com/LIV2/libnix.git
synced 2025-12-06 00:23:08 +00:00
fix merge
This commit is contained in:
parent
7c31467c10
commit
473621aaed
@ -10,10 +10,5 @@
|
||||
#include <proto/exec.h>
|
||||
|
||||
void amiputchar(char c) {
|
||||
<<<<<<< HEAD
|
||||
FPutC(Output(), c);
|
||||
=======
|
||||
BPTR f = Output();
|
||||
FPutC(f, c);
|
||||
>>>>>>> refs/heads/master
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user