Skip to content

Commit

Permalink
Fix mismerge for tensorflow (from report)
Browse files Browse the repository at this point in the history
  • Loading branch information
AMDmi3 committed Oct 24, 2023
1 parent 5079599 commit 84ea824
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion 800.renames-and-merges/t.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@
- { setname: telepresence, name: telepresence2 }
- { setname: template-glib, name: libtemplate-glib }
- { setname: tensorboard, name: ["python:tensorboard", "python:tensorboard1", "python:tensorflow-tensorboard"] }
- { setname: tensorflow, namepat: "(?:lib|python:)?tensorflow[0-9.-]*(gnu-hpc|gnu-openmpi2-hpc|lite|cpu|gpu)?", addflavor: $1 }
- { setname: tensorflow, namepat: "(?:lib)?tensorflow[0-9.-]*(gnu-hpc|gnu-openmpi2-hpc|lite|cpu|gpu)?", addflavor: $1 }
- { setname: tensorflow, name: python:tensorflow }
- { setname: tensorflow, name: [python:tensorflow-cpu, python:tensorflow-gpu], addflavor: true }
- { setname: tepl, namepat: "(?:lib)?tepl[0-9.-]*" }
- { setname: terminal-markdown-viewer, name: mdv }
- { setname: termtosvg, name: "python:termtosvg" }
Expand Down

0 comments on commit 84ea824

Please sign in to comment.