Closed edsu closed 13 years ago
This is merged into my tree - it looks like you might not have had a completely up to date tree before starting so I dropped the second commit & rebased your NDNP additions on top of it in acdha@40b30fd50072f889318e1d8ef4f6867ae014238c
I made some local commits before pulling latest from acdha, when I got a conflict it was a minor section added by mjgiarlo which I preserved, but my commit shows a bunch of added files. Not sure if I screwed something up. I imagine someone will let me know if I did :-)