瀏覽代碼

Merge branch 'master' of https://github.com/bashrc/freedombone

Bob Mottram 7 年之前
父節點
當前提交
33c9bbe991
共有 1 個檔案被更改,包括 0 行新增1 行删除
  1. 0
    1
      doc/EN/meshindex.org

+ 0
- 1
doc/EN/meshindex.org 查看文件

@@ -10,7 +10,6 @@
10 10
 [[file:images/logo.png]]
11 11
 
12 12
 * Welcome to the Freedombone Mesh
13
->>>>>>> 9b2ac0e151a7d39cc6d29d10c465e88e1882efec
14 13
 
15 14
 #+BEGIN_EXPORT html
16 15
  <center>