You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tvm.apache.org by ar...@apache.org on 2022/06/17 22:36:16 UTC

[tvm] 13/29: fix merge conflict

This is an automated email from the ASF dual-hosted git repository.

areusch pushed a commit to branch areusch/freeze-dependencies
in repository https://gitbox.apache.org/repos/asf/tvm.git

commit 39d81aa6b883a3da9e0ed8bf4102a2860f959fe1
Author: Andrew Reusch <ar...@gmail.com>
AuthorDate: Mon Jun 6 15:15:53 2022 -0700

    fix merge conflict
---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b0cd9d18d4..dfc56954e0 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -45,7 +45,7 @@
 // 'python3 jenkins/generate.py'
 // Note: This timestamp is here to ensure that updates to the Jenkinsfile are
 // always rebased on main before merging:
-// Generated at 2022-06-10T14:18:51.282631
+// Generated at 2022-06-10T14:19:29.844444
 
 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. -->