brotherton-erpnext/.gitignore

*.pyc
*.py~
.DS_Store
conf.py
locale
latest_updates.json
.wnf-lang-status
*.egg-info
dist/
erpnext/docs/current
*.swp
<<<<<<< HEAD
*.swo
__pycache__
*~
=======
>>>>>>> master
added git ignore 2011-06-22 11:09:43 +00:00			`*.pyc`
added .py~ to gitignore 2013-01-07 07:24:10 +00:00			`*.py~`
added git ignore 2011-06-22 11:09:43 +00:00			`.DS_Store`
lib/py/webnotes/defs.py -> conf.py (see sample in lib/conf/conf.py) 2012-04-14 10:38:45 +00:00			`conf.py`
[build/translate] now translate will work on demand 2013-06-17 06:39:53 +00:00			`locale`
[feature] generate latest updates page from git commit log 2013-07-09 09:06:41 +00:00			`latest_updates.json`
[build/translate] now translate will work on demand 2013-06-17 06:39:53 +00:00			`.wnf-lang-status`
added setup.py 2013-12-11 06:02:21 +00:00			`*.egg-info`
			`dist/`
[docs] remove /docs/current from repo, they are re-built anyways 2016-02-04 11:40:24 +00:00			`erpnext/docs/current`
Delete .swp (#12894) * Delete .swp * updated gitignore to exclude temp vim files 2018-02-13 12:57:02 +00:00			`*.swp`
[fix] resolve conflicts 2018-05-31 12:02:17 +00:00			`<<<<<<< HEAD`
Delete .swp (#12894) * Delete .swp * updated gitignore to exclude temp vim files 2018-02-13 12:57:02 +00:00			`*.swo`
Doc imp (#13148) * added intro, item and prices video, fixed image links in item and prices * update 2: first 5 videos added * added all videos to the user manual * updated .gitignore 2018-03-05 05:36:44 +00:00			`__pycache__`
Delete .swp (#12894) * Delete .swp * updated gitignore to exclude temp vim files 2018-02-13 12:57:02 +00:00			`*~`
[fix] resolve conflicts 2018-05-31 12:02:17 +00:00			`=======`
			`>>>>>>> master`