Miroirs/rpn
1
0
Fork 0
mirror of https://github.com/louisrubet/rpn synced 2025-01-30 20:34:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Resolved conflict

Browse source
This commit is contained in:
Louis Rubet 2017-06-10 15:23:04 +02:00
commit 563ebe0636
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/rpn-branch.hpp
View file

@ -147,7 +147,6 @@ int rpn_repeat(branch& myobj)
return ret;
}
>>>>>>> #117, #116, #119: added while..repeat, added do..until tests, until in addition to until
int rpn_start(branch& myobj)
{
int ret = -1;

1
test/04-branch.txt
View file

@ -80,6 +80,7 @@ erase
-> error should be 3
erase
<<<<<<< HEAD
# ift (1)
1 'ok' ift
-> stack should be 'ok'