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 2016/06/20 21:36:32 UTC

[15/17] incubator-mynewt-site git commit: Fixed table in about.md

Fixed table in about.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/90c58f24
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/90c58f24
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/90c58f24

Branch: refs/heads/master
Commit: 90c58f2479735f57bb5d68ef1dd12019e45a1988
Parents: e94b3f3
Author: aditihilbert <ad...@runtime.io>
Authored: Fri Jun 17 17:30:41 2016 -0700
Committer: aditihilbert <ad...@runtime.io>
Committed: Fri Jun 17 17:30:41 2016 -0700

----------------------------------------------------------------------
 docs/about.md | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/90c58f24/docs/about.md
----------------------------------------------------------------------
diff --git a/docs/about.md b/docs/about.md
index b8e2125..411e350 100644
--- a/docs/about.md
+++ b/docs/about.md
@@ -1,7 +1,6 @@
 ###Roadmap
 
 
-<<<<<<< HEAD
 Release Version |  Date |Features 
 ------------ |------|-------
 0.9.0 |  May, 2016 | * Support images in external flash