Fix incorrect conflict resolution in Iaf0960a595

When merging stable-3.10 into stable-3.11, the removal of the /git
subdirectory from the NFS mount was missed, causing the nfs-server
to fail in stable-3.11.

Change-Id: I947d7e51afcdf74d7c63ef03a0951c4407c34a61

src/test/docker/docker-compose.yaml

diff --git a/src/test/docker/docker-compose.yaml b/src/test/docker/docker-compose.yaml
index d2b971f..fe4ed3b 100644
--- a/src/test/docker/docker-compose.yaml
+++ b/src/test/docker/docker-compose.yaml
@@ -20,7 +20,7 @@
       gerrit-net:
         ipv4_address: 192.168.1.5
     volumes:
-      - nfs-server-volume:/var/gerrit/git
+      - nfs-server-volume:/var/gerrit
 
   zookeeper-refdb:
     image: zookeeper