Unresolved conflict in https://github.com/AgoraIO/Tools/blob/master/DynamicKey/AgoraDynamicKey/cpp/src/RtcTokenBuilder.h

[yamasite]

  static std::string buildTokenWithUserAccount(
<<<<<<< HEAD
      const std::string& appId,
      const std::string& appCertificate,
      const std::string& channelName,
      const std::string& userAccount,
      UserRole role,
      uint32_t privilegeExpiredTs = 0);

  static std::string buildTokenWithUserAccount(
       const std::string& appId,
       const std::string& appCertificate,
       const std::string& channelName,
       const std::string& userAccount,
       uint32_t joinChannelPrivilegeExpiredTs = 0,
       uint32_t pubAudioPrivilegeExpiredTs = 0,
       uint32_t pubVideoPrivilegeExpiredTs = 0,
       uint32_t pubDataStreamPrivilegeExpiredTs = 0);
=======
      const std::string& appId, const std::string& appCertificate,
      const std::string& channelName, const std::string& userAccount,
      UserRole role, uint32_t privilegeExpiredTs = 0);
>>>>>>> parent of 4408a79... Merge pull request #154 from winking324/dev/accesstoken2
};