search

wkeese / old-api-viewer

Old viewer for output of old js-doc-parse, replaced by https://github.com/dojo/dapi
22 stars 10 forks source link

js-doc-parse 'all-my-changes' branch has git merge issues #60

Closed zemanel closed 11 years ago

zemanel commented 11 years ago

the documentation generation instructions refer to the 'all-my-changes' branch of

https://github.com/wkeese/js-doc-parse/

but the 'all-my-changes' branch has issues with a badly merged branch ("<<<<<<< HEAD" artifacts):

https://github.com/wkeese/js-doc-parse/blob/all-my-changes/lib/exporter/dojov1.js#L287

wkeese commented 11 years ago

OK, I moved my changes to the master branch and updated the instructions. The bad merge seems to be gone.