From 2762ce780ae4aa6d237ec360a6e8c610f4cfa5ad Mon Sep 17 00:00:00 2001
From: Alexander Hurd <hurdad@gmail.com>
Date: Wed, 12 Oct 2016 03:43:13 -0400
Subject: [PATCH] ready for merge

---
 SanAndreasMultiplayer/sampserver | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/SanAndreasMultiplayer/sampserver b/SanAndreasMultiplayer/sampserver
index 219b9e173..6fa9a9165 100755
--- a/SanAndreasMultiplayer/sampserver
+++ b/SanAndreasMultiplayer/sampserver
@@ -30,7 +30,6 @@ pushbullettoken="accesstoken"
 ip="0.0.0.0"
 port="7777"
 
-#no params - check server.cfg
 fn_parms(){
 parms=" "
 }
@@ -42,7 +41,7 @@ parms=" "
 # from a different repo and/or branch.
 githubuser="dgibbs64"
 githubrepo="linuxgsm"
-githubbranch="samp"
+githubbranch="master"
 
 # Server Details
 servicename="samp-server"