Merge branch 'testing'
This commit is contained in:
commit
61b9784782
|
@ -18,15 +18,23 @@
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
"""
|
"""
|
||||||
|
<<<<<<< HEAD
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> testing
|
||||||
|
|
||||||
|
|
||||||
import os
|
|
||||||
import re
|
import re
|
||||||
import requests
|
import requests
|
||||||
import markovify
|
import markovify
|
||||||
|
import html2text
|
||||||
|
import os
|
||||||
import sys
|
import sys
|
||||||
import argparse
|
import argparse
|
||||||
|
<<<<<<< HEAD
|
||||||
import html2text
|
import html2text
|
||||||
|
=======
|
||||||
|
>>>>>>> testing
|
||||||
from functions import URL, convert_html, read, mkbtext, mkbnewline, writesentence, writeshortsentence
|
from functions import URL, convert_html, read, mkbtext, mkbnewline, writesentence, writeshortsentence
|
||||||
|
|
||||||
# argparse
|
# argparse
|
||||||
|
|
Loading…
Reference in New Issue