|
@@ -35,16 +35,6 @@ How to Get Started:
|
|
|
:maxdepth: 3
|
|
:maxdepth: 3
|
|
|
:glob:
|
|
:glob:
|
|
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
-
|
|
|
|
|
-contributing/contributing_code.rst
|
|
|
|
|
-contributing/contributing_documentation.rst
|
|
|
|
|
-contributing/contributing_translations.rst
|
|
|
|
|
-contributing/qa_testing.rst
|
|
|
|
|
-contributing/github_rebase.rst
|
|
|
|
|
-#contributing/coding_standards
|
|
|
|
|
-#contributing/directory_structure
|
|
|
|
|
-=======
|
|
|
|
|
contributing/contributing_code.rst
|
|
contributing/contributing_code.rst
|
|
|
contributing/contributing_documentation.rst
|
|
contributing/contributing_documentation.rst
|
|
|
contributing/contributing_translations.rst
|
|
contributing/contributing_translations.rst
|
|
@@ -52,4 +42,3 @@ contributing/github_rebase.rst
|
|
|
contributing/coding_standards
|
|
contributing/coding_standards
|
|
|
contributing/directory_structure
|
|
contributing/directory_structure
|
|
|
|
|
|
|
|
->>>>>>> refs/remotes/origin/master
|
|
|
Len