diff options
author | =Corey Hulen <corey@hulen.com> | 2015-07-21 12:26:27 -0800 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-07-21 12:26:27 -0800 |
commit | 848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09 (patch) | |
tree | 98390442e8052b8e02469e5ccf7596e22b7ea07f /scripts | |
parent | e87adce4a059b97a65198b326be6304abdf4e657 (diff) | |
parent | bee26e3f2654ce7acce647818847480569236343 (diff) | |
download | chat-848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09.tar.gz chat-848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09.tar.bz2 chat-848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09.zip |
fixing merge conflicts
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/README_DEV.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/README_DEV.md b/scripts/README_DEV.md index 6a2dfc54d..be24daad9 100644 --- a/scripts/README_DEV.md +++ b/scripts/README_DEV.md @@ -10,7 +10,7 @@ DOCKER SETUP 3. Add a line to your /etc/hosts that goes `<Docker IP> dockerhost` 4. Run `boot2docker shellinit` and copy the export statements to your ~/.bash_profile -Any issues? Please let us know on our forums at: http://bit.ly/1MY1kul +Any issues? Please let us know on our forums at: http://forum.mattermost.org GO SETUP @@ -39,4 +39,4 @@ MATTERMOST SETUP 6. Then do `cd platform` and `make test`. Provided the test runs fine, you now have a complete build environment. 7. Use `make run` to run your code -Any issues? Please let us know on our forums at: http://bit.ly/1MY1kul
\ No newline at end of file +Any issues? Please let us know on our forums at: http://forum.mattermost.org |