Fix merge conflict glitch

Author: cjbj

lib/errors.js

@@ -116,7 +116,6 @@ const adjustErrorXref = new Map();
 adjustErrorXref.set("DPI-1040", ERR_LOB_CLOSED);
 adjustErrorXref.set("DPI-1055", ERR_NAN_VALUE);
 adjustErrorXref.set("DPI-1063", ERR_EXEC_MODE_ONLY_FOR_DML);
-adjustErrorXref.set("ORA-01036", ERR_INVALID_BIND_NAME);
 adjustErrorXref.set("ORA-24338", ERR_INVALID_REF_CURSOR);
 adjustErrorXref.set("ORA-24422", ERR_POOL_HAS_BUSY_CONNECTIONS);
 

test/autoCommit4nestedExecutes.js

@@ -150,8 +150,8 @@ describe('63. autoCommit4nestedExecutes.js', function() {
         { autoCommit: false });
     } catch (err) {
       assert(err);
-      // NJS-097: illegal variable name/number
-      assert.equal(err.message.substring(0, err.message.indexOf(':')), `NJS-097`);
+      // ORA-01036: illegal variable name/number
+      assert.equal(err.message.substring(0, err.message.indexOf(':')), `ORA-01036`);
     }
 
     await conn.release();