From ea621c31fc299b127ec5caf07430e87405701287 Mon Sep 17 00:00:00 2001 From: Yorick Date: Mon, 10 Oct 2016 11:14:28 +0200 Subject: [PATCH] Tested with FreeNAS 9.10 --- gogs-root.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gogs-root.sh b/gogs-root.sh index c697bad..14fe9e7 100755 --- a/gogs-root.sh +++ b/gogs-root.sh @@ -1,11 +1,7 @@ #!/bin/tcsh echo "FreeNAS Gogs installation script." echo "This has been tested on:" -<<<<<<< HEAD -echo " 9.3-RELEASE-p29" -======= -echo " 9.3-RELEASE-p29 FreeBSD" ->>>>>>> 24052457bbabf197b2c4e1745f45901fa9e247f2 +echo " FreeNAS 9.10" echo echo echo "Press any key to begin"