You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ad...@apache.org on 2017/04/26 00:51:22 UTC
[11/12] incubator-mynewt-site git commit: fixed merge conflicts
fixed merge conflicts
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/7b21947d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/7b21947d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/7b21947d
Branch: refs/heads/develop
Commit: 7b21947dd4ae66c7acdfd3af4b7d107fbf6fc186
Parents: a60c6fd 2fa19db
Author: aditihilbert <ad...@runtime.io>
Authored: Tue Apr 25 16:58:04 2017 -0700
Committer: aditihilbert <ad...@runtime.io>
Committed: Tue Apr 25 16:58:04 2017 -0700
----------------------------------------------------------------------
docs/newt/install/newt_linux.md | 305 ++++++++++++++++++++---------------
docs/newtmgr/install_linux.md | 214 +++++++++++++++++++-----
2 files changed, 356 insertions(+), 163 deletions(-)
----------------------------------------------------------------------