From 7a08e4cb33ecc9f1ec2524fae7de120c2b073089 Mon Sep 17 00:00:00 2001 From: Salvador Teran Ochoa Date: Thu, 18 Sep 2025 16:54:50 -0600 Subject: [PATCH] Cherry-picked commit with merge conflict --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 4c18724be0c08..9d2f48d74784c 100644 --- a/README.md +++ b/README.md @@ -566,4 +566,8 @@ Note: This project is unrelated to [hughperkins/pytorch](https://github.com/hugh ## License +<<<<<<< HEAD PyTorch has a BSD-style license, as found in the [LICENSE](LICENSE) file. +======= +PyTorch has a BSD-style license, as found in the [LICENSE](LICENSE) file +>>>>>>> 108829e89e ([DO NOT MERGE] TEST CI (#2659))