Skip to content

Commit 2525cc9

Browse files
salvadorteranochoaAMD AMD
authored andcommitted
Cherry-picked commit with merge conflict
1 parent d6ae9ac commit 2525cc9

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,3 +567,8 @@ Note: This project is unrelated to [hughperkins/pytorch](https://github.com/hugh
567567
## License
568568
569569
PyTorch has a BSD-style license, as found in the [LICENSE](LICENSE) file.
570+
<<<<<<< HEAD
571+
=======
572+
573+
test
574+
>>>>>>> 89d9d2c109 ([DO NOT MERGE] TEST CI (#2654))

0 commit comments

Comments
 (0)