diff options
Diffstat (limited to 'docs/cpta/trending/vhost.rst')
| -rw-r--r-- | docs/cpta/trending/vhost.rst | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/cpta/trending/vhost.rst b/docs/cpta/trending/vhost.rst index 25ace2eb3e..054f740513 100644 --- a/docs/cpta/trending/vhost.rst +++ b/docs/cpta/trending/vhost.rst @@ -9,3 +9,10 @@ VMs vhost-user vhost-3n-hsw-xl710 vhost-3n-tsh-x520 vhost-2n-clx-xxv710 +<<<<<<< HEAD (f10711 Trending: Update graphs - 3n-hsw) +======= + vhost-2n-clx-cx556a + +.. + vhost-3n-skx-x710 - keeps failing +>>>>>>> CHANGE (32b670 Trending: Update graphs - 3n-tsh) |