2.27
11/30 13:52:59 srvc 0068 BinkIT connection accepted from: 98.3.43.197 port 48720
11/30 13:52:59 srvc 0068 BinkIT !JavaScript /sbbs/exec/binkit.js line 1: SyntaxError: illegal XML character
11/30 13:52:59 srvc 0068 !JavaScript FAILED to compile script (/sbbs/exec/binkit.js)
11/30 13:52:59 srvc 0068 BinkIT service thread terminated (0 clients remain, 0 total, 9 served)
Here is the beginning of the js file:
<<<<<<< binkit.js
// $Id: binkit.js,v 2.26 2019/06/14 21:08:42 rswindell Exp $
// vi: tabstop=4
=======
// $Id: binkit.js,v 2.27 2019/06/17 05:21:19 rswindell Exp $
// vi: tabstop=4
2.27
The copy in my backup looks like this:
// $Id: binkit.js,v 2.26 2019/06/14 21:08:42 rswindell Exp $
// vi: tabstop=4
/*
I think it does not like the less-than & greater-than characters. I tried taking all of them out and leaving this:
// $Id: binkit.js,v 2.27 2019/06/17 05:21:19 rswindell Exp $
// vi: tabstop=4
But apparently the source is full of those characters as it threw the same error for line 25. I saved the previous backup copy over it so hopefully it will work with the sbbs code I pulled today.
Those are merge-conflict markers. Simply deleting the version you have locally >nd getting again via CVS will fix that.
"cvs update -C" would also work.
Those are merge-conflict markers. Simply deleting the version you have locally >nd getting again via CVS will fix that.
Ahh, I have seen those pop up in menu files before too and wondered how
they got there! :)
"cvs update -C" would also work.
So that will cause the new version to overwrite rather than merge?
Sysop: | CyberNix |
---|---|
Location: | London, UK |
Users: | 18 |
Nodes: | 10 (0 / 10) |
Uptime: | 52:38:09 |
Calls: | 819 |
Files: | 3,532 |
Messages: | 556,922 |