diff options
-rwxr-xr-x | bin/pre-generate | 2 | ||||
-rw-r--r-- | src/dnd/psionist2.org (renamed from src/dnd/Psionist2.org) | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/bin/pre-generate b/bin/pre-generate index bd1c21e..ece3385 100755 --- a/bin/pre-generate +++ b/bin/pre-generate @@ -24,6 +24,8 @@ if [[ $branch == master ]]; then git add . git commit -m "make: $msg" + git checkout pre-generated + git checkout pre-generated.tmp git merge --no-edit -s ours pre-generated git checkout pre-generated git merge pre-generated.tmp diff --git a/src/dnd/Psionist2.org b/src/dnd/psionist2.org index 0cc0a84..f882690 100644 --- a/src/dnd/Psionist2.org +++ b/src/dnd/psionist2.org @@ -1,3 +1,7 @@ +#+TITLE: [5e] Psionist Class - Rewrite [ALPHA] +#+CLASS: dnd +#+CATEGORIES: HB + #+HTML_HEAD_EXTRA: <style type="text/css">#content { padding: 0px 16%; width: 68%; } body { background: url(Background3.png) repeat-y; background-size: 100%;} </style> * Introduction to the Psionist Class [5e] |