resolving conflict in docs/chapter1/try_markdown.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/commit/4c2fc385 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/4c2fc385 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/4c2fc385 Branch: refs/heads/asf-site Commit: 4c2fc38568deb29c0cf7fb42b8589f27216f0833 Parents: 2e79c54 69ceefd Author: aditihilbert <ad...@runtime.io> Authored: Fri Nov 20 12:07:47 2015 -0800 Committer: aditihilbert <ad...@runtime.io> Committed: Fri Nov 20 12:07:47 2015 -0800 ---------------------------------------------------------------------- docs/chapter4/mutex.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
