Merge branch 'Feature-JS-Support-Library' of github.com:zhiming99/rpc…

…-frmwrk into Feature-JS-Support-Library
zhiming99 · Jan 17, 2024 · 8cfbead · 8cfbead
2 parents e7a8ac0 + f2d1dcc
commit 8cfbead
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/js/combase/msgmatch.js b/js/combase/msgmatch.js
@@ -145,9 +145,6 @@ exports.CMessageMatch = class CMessageMatch extends CObjBase
         return strAll
     }
 
-<<<<<<< HEAD
-}
-=======
     Serialize()
     {
         this.m_oCfg.SetString(
@@ -197,4 +194,3 @@ exports.CMessageMatch = class CMessageMatch extends CObjBase
         return offset + SERI_HEADER_BASE.GetSeriSize() + oHdr.dwSize
     }
 }
->>>>>>> f2d1dcc4 (. added 'js' directory to the build tree.)