attempted merge of conflicts in PR 91.

#91
dictation-toolbox · Aug 31, 2024 · b62e968 · b62e968
1 parent cc8b693
commit b62e968
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 410 deletions.
diff --git a/.gitignore b/.gitignore
@@ -95,6 +95,8 @@ MacroSystem/*_vcl.py
 src/dist/
 dist
 
+# git extensions
+*.orig
 #tests
 
 

diff --git a/documentation/conf.py b/documentation/conf.py
@@ -69,6 +69,7 @@ def __getattr__(cls, name):
     'vocoladirectory',
     'unimacrodirectory',
     'unimacrogrammarsdirectory',
+    'unimacro.spokenforms',
 }
 for module_name in mock_modules:
     sys.modules[module_name] = Mock()

diff --git a/documentation/documentation.rst b/documentation/documentation.rst
@@ -27,7 +27,6 @@ Then run the following command on Windows to build the documentation:
    $ ./make html
 
 
-
 If there were no errors during the build process, open the
 *_build/html/index.html* file in a web browser. Make changes, rebuild the
 documentation and reload the doc page(s) in your browser as you go.
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,6 +95,8 @@ MacroSystem/*_vcl.py @@
     src/dist/
     dist
+    # git extensions
+    *.orig
     #tests
@@ Expand Down @@