From ab4f2354874a41f0185690dfaffc42b0b3e73273 Mon Sep 17 00:00:00 2001 From: Andrew Murrell Date: Sat, 14 Jan 2017 03:02:57 +0000 Subject: updated Psionist Title page --- bin/pre-generate | 2 ++ 1 file changed, 2 insertions(+) (limited to 'bin') 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 -- cgit v1.2.3