Skip to content

Commit

Permalink
Merge branch 'master' of github.com:touchandgo-devs/touchandgo
Browse files Browse the repository at this point in the history
Conflicts:
	README.rst
  • Loading branch information
felipelerena committed Nov 14, 2014
2 parents a988b20 + 90c08d8 commit 4c03eda
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ In your video player open http://<server address>:5000/crisis/1/5

just enjoy it.

Touchandgo in action with debug
-------------------------------
If you run Touchandgo in debug mode (with --verbose),
You will see this (see the screenshot)that we call"defrag".
Expand Down

0 comments on commit 4c03eda

Please # to comment.