klion26 edited a comment on pull request #12665: URL: https://github.com/apache/flink/pull/12665#issuecomment-651543553
@yangyichao-mango thanks for your contribution. could you please rebase the master to resolve the conflict I think the conflict here is that FLINK-12428 translated the doc, maybe the easiest way to resolve the conflict is to revert the change of `event_time.zh.md`, sorry for the inconvenience. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
