RPP
/
Tips_and_Hacks
forked from hmw3/Tips_and_Hacks
8
0
Fork 0
Files Issues Pull Requests Releases Wiki Activity See in Reader

Auto stash before merge of "master" and "origin/master"

This commit is contained in:
Henry Whitney 2019-09-02 14:51:28 -04:00
parent 6715eb8f3b
commit 2de51f845e
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MAST_tW_PDF_Updater/FilesForUpdates/Logs/mine_log.log
View File

@ -11,6 +11,9 @@ $exceptions_file: /home/henry/Documents/WA_Repo/Tips_and_Hacks/MAST_tW_PDF_Updat
$blbRef: https://www.biblehub.com/job/7-14.htm
xxx
$missingLine: Job 7:14 2865, $ref: Job 7:14, $book_name: Job, $ch: 7, $vs: 14
<<<<<<< Updated upstream
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
$dataFile: /Users/Henry/Documents/git.Door43/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/User/tW_work_OT.txt
@ -79,6 +82,7 @@ $line: #37 Haggai hag Hag
$line: #38 Zechariah zec Zec
$line: #39 Malachi mal Mal
<<<<<<< Updated upstream
<<<<<<< Updated upstream
FindVerse |H7379|.
$ref: 1 Samuel 24:15
$fore: May Yahweh be judge and give judgment between you and me, and see to it, and plead my cause and permit me to escape from your hand."
@ -94,6 +98,8 @@ $preprecon: "The LORD <H3068> therefore be judge <H1781> and decide <H8199> betw
$word: cause
<<cause>>
=======
=======
>>>>>>> Stashed changes
FindVerse |H2865|.
$ref: Job 7:14
$fore: then you frighten me with dreams and terrify me through visions,
@ -108,4 +114,7 @@ $&: Then Thou dost frighten <
$preprecon: Then Thou dost
$word: frighten
<<frighten>>
<<<<<<< Updated upstream
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes

6
MAST_tW_PDF_Updater/FilesForUpdates/strongs.sh
View File

@ -1,11 +1,17 @@
<<<<<<< Updated upstream
<<<<<<< Updated upstream
curl https://biblehub.com/hebrew/7379.htm > /Users/Henry/Documents/git.Door43/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/Strongs_raw.html
perl get_strongs_gist.pl
open -a /Applications/Firefox.app /Users/Henry/Documents/git.Door43/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/This_interlinear.html /Users/Henry/Documents/git.Door43/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/This_verse.html /Users/Henry/Documents/git.Door43/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/Strongs.html /Users/Henry/Documents/git.Door43/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/mine_results.html &
open -a /Applications/BBEdit.app --new-window /Users/Henry/Documents/git.Door43/en_tn/1sa/24/15.md &
=======
=======
>>>>>>> Stashed changes
curl https://biblehub.com/hebrew/2865.htm > /home/henry/Documents/WA_Repo/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/Strongs.html
perl get_strongs_gist.pl
firefox /home/henry/Documents/WA_Repo/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/This_interlinear.html /home/henry/Documents/WA_Repo/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/This_verse.html /home/henry/Documents/WA_Repo/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/Strongs.html /home/henry/Documents/WA_Repo/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/mine_results.html &
/home/henry/Komodo-Edit-8/lib/mozilla/komodo --new-window /home/henry/Documents/WA_Repo/en_tw/bible/kt/fear.md /home/henry/Documents/WA_Repo/en_tw/bible/kt/sign.md /home/henry/Documents/WA_Repo/en_tw/bible/other/amazed.md /home/henry/Documents/WA_Repo/en_tw/bible/other/awe.md /home/henry/Documents/WA_Repo/en_tw/bible/other/disgrace.md /home/henry/Documents/WA_Repo/en_tw/bible/other/terror.md /home/henry/Documents/WA_Repo/en_tn/job/07/14.md &
<<<<<<< Updated upstream
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes