Skip to content

Commit 931f699

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

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,4 +566,8 @@ Note: This project is unrelated to [hughperkins/pytorch](https://github.com/hugh
566566
567567
## License
568568
569+
<<<<<<< HEAD
569570
PyTorch has a BSD-style license, as found in the [LICENSE](LICENSE) file.
571+
=======
572+
PyTorch has a BSD-style license, as found in the [LICENSE](LICENSE) file
573+
>>>>>>> 108829e89e ([DO NOT MERGE] TEST CI (#2659))

0 commit comments

Comments
 (0)