From 51c68afa59ef7c9dba8a4a97ed64157fc1410359 Mon Sep 17 00:00:00 2001 From: Anders Nickelsen Date: Wed, 27 Apr 2016 12:51:37 +0200 Subject: [PATCH] Don't merge on initialization. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b7ca8e7..5f6c913 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Project to run the whole ggtracker stack in vagrant ### Running * Make sure you have vagrant+virtualbox installed on your computer - * Run `git submodule update --init --remote --merge --recursive` to pull the latest version of each submodule + * Run `git submodule update --init --remote --recursive` to pull the latest version of each submodule * Run `vagrant up` to create the virtual box. This will download all required packages and go through the installation process for ggtracker and ESDB (~15 minutes; go make yourself a sandwich) * Run `vagrant ssh` to ssh into the vagrant box * Make a note of your vagrant IP: In the text it prints out upon login it says IP address for eth1: 172.28.128.3 (potentially some other ip)