瀏覽代碼

Merge remote-tracking branch 'refs/remotes/origin/master' into fusionpbx/master

Len 9 年之前
父節點
當前提交
9dcb9f54ec
共有 1 個文件被更改,包括 12 次插入1 次删除
  1. 12 1
      source/contributing.rst

+ 12 - 1
source/contributing.rst

@@ -28,12 +28,14 @@ How to Get Started:
   Contributing Code or Documentation requires knowledge of Git, Github and how to create pull requests on Github.
   Contributing Code or Documentation requires knowledge of Git, Github and how to create pull requests on Github.
   This is not as bad as it sounds and if you are willing to learn we will help you through it. 
   This is not as bad as it sounds and if you are willing to learn we will help you through it. 
 
 
+|
 
 
 
 
 .. toctree::
 .. toctree::
-  :maxdepth: 4
+  :maxdepth: 3
   :glob:
   :glob:
 
 
+<<<<<<< HEAD
     
     
 contributing/contributing_code.rst
 contributing/contributing_code.rst
 contributing/contributing_documentation.rst
 contributing/contributing_documentation.rst
@@ -42,3 +44,12 @@ contributing/qa_testing.rst
 contributing/github_rebase.rst
 contributing/github_rebase.rst
 #contributing/coding_standards
 #contributing/coding_standards
 #contributing/directory_structure
 #contributing/directory_structure
+=======
+  contributing/contributing_code.rst
+  contributing/contributing_documentation.rst
+  contributing/contributing_translations.rst
+  contributing/qa_testing.rst
+  contributing/coding_standards
+  contributing/directory_structure
+
+>>>>>>> refs/remotes/origin/master