Commitcbbe45c

committed

Fixed the rest of the conficts

1 parent14645e3 commitcbbe45cCopy full SHA for cbbe45c

File tree

-5

lines changed

-5

lines changed

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,6 @@ python script/spider.py -c config/prod.cfg -e`
`37`	`37`	`python script/spider.py -c config/prod.cfg -t epub --upload googledrive`
`38`	`38`	`python script/spider.py --config config/prod.cfg --all --extras --upload googledrive`
`39`	`39`
`40`		`-# download and then upload to OneDrive (given the download url anyone can download it)`
`41`		`-python script/spider.py -c config/prod.cfg -t epub --upload onedrive`
`42`		`-python script/spider.py --config config/prod.cfg --all --extras --upload onedrive`
`43`		`-`
`44`	`40`	`# download and notify: gmail\|ifttt\|join`
`45`	`41`	`python script/spider.py -c config/prod.cfg --notify gmail`
`46`	`42`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ def main():`
`60`	`60`	`parser=argparse.ArgumentParser(`
`61`	`61`	`description='Download FREE eBook every day from www.packtpub.com',`
`62`	`62`	`formatter_class=argparse.ArgumentDefaultsHelpFormatter,`
`63`		`-version='2.4.1')`
	`63`	`+version='2.4.0')`
`64`	`64`
`65`	`65`	`parser.add_argument('-c','--config',required=True,help='configuration file')`
`66`	`66`	`parser.add_argument('-d','--dev',action='store_true',help='only for development')`

Comments

(0)