Merge pull request #16 from umdwr/main

Main
umdwr · Jul 15, 2023 · 0868c12 · 0868c12
2 parents a84026c + aa14aa7
commit 0868c12
Show file tree

Hide file tree

Showing 3 changed files with 175 additions and 313 deletions.
diff --git a/source/alib/writing/writ101/writ101s.rst b/source/alib/writing/writ101/writ101s.rst
@@ -1,6 +1,12 @@
+<<<<<<< HEAD
+==========================================
+WRIT 100/101 with *The Writer's Practice*
+==========================================
+=======
 =========================================
 WRIT 100/101 with *The Writer's Practice*
 =========================================
+>>>>>>> bd7c44ca9943d607ab10f067d16fc73e48f79f3b
 .. sidebar:: Contents
 
     .. contents::