modified: BBSLIST.PAS

This commit is contained in:
R. Eric Wheeler 2013-07-21 01:16:13 -07:00
parent 0bf2c9f3ed
commit 02deff98b5
1 changed files with 0 additions and 12 deletions

View File

@ -627,11 +627,7 @@ BEGIN
ReadBuffer('BBSLEM'); ReadBuffer('BBSLEM');
DisplayBuffer(BBSListMCI,@BBSList,Data2); DisplayBuffer(BBSListMCI,@BBSList,Data2);
NL; NL;
<<<<<<< HEAD
IF (PYNQ(' |03Would you like to edit this BBS Listing? |11',0,TRUE)) THEN
=======
IF (PYNQ(' Would you like to edit this BBS Listing? ',0,TRUE)) THEN IF (PYNQ(' Would you like to edit this BBS Listing? ',0,TRUE)) THEN
>>>>>>> testing
BEGIN BEGIN
BBSListScriptFile(BBSList); BBSListScriptFile(BBSList);
@ -642,11 +638,7 @@ BEGIN
DisplayBuffer(BBSListMCI,@BBSList,Data2); DisplayBuffer(BBSListMCI,@BBSList,Data2);
PrintF('BBSNT'); PrintF('BBSNT');
NL; NL;
<<<<<<< HEAD
IF (PYNQ(' |03Would you like to save this BBS Listing? |11',0,TRUE)) THEN
=======
IF (PYNQ(' Would you like to save this BBS Listing? ',0,TRUE)) THEN IF (PYNQ(' Would you like to save this BBS Listing? ',0,TRUE)) THEN
>>>>>>> testing
BEGIN BEGIN
Seek(BBSListFile,(Edit -1)); Seek(BBSListFile,(Edit -1));
BBSList.DateEdited := GetPackDateTime; BBSList.DateEdited := GetPackDateTime;
@ -740,11 +732,7 @@ BEGIN
PrintF('BBSLET'); PrintF('BBSLET');
NL; NL;
MPL(FileSize(BBSListFile)); MPL(FileSize(BBSListFile));
<<<<<<< HEAD
InputLongIntWOC(' View which BBS? :',Edit,[],1,FileSize(BBSListFile));
=======
InputLongIntWOC(' View which BBS? ',Edit,[],1,FileSize(BBSListFile)); InputLongIntWOC(' View which BBS? ',Edit,[],1,FileSize(BBSListFile));
>>>>>>> testing
Abort := (Edit <> 0 ); Abort := (Edit <> 0 );