search

18F / bpa-opm-eqip

Other
7 stars 5 forks source link

formatting update for RFQ #6

Closed jehlers closed 7 years ago

jehlers commented 7 years ago

put "(vii) Date of submission" into the block quote, matched "a." formatting with their attached bolded or italicized headers, adding links to attached documents

billygriffin commented 7 years ago

There were already changes that conflicted with this @jehlers, so I couldn't merge easily. I think I hit everything you did, but let me know if you see anything that's not there in the master branch. If you're 👍 I'll close this PR.

jehlers commented 7 years ago

@billy22g Looks good to me! Sorry for the conflicts!

stvnrlly commented 7 years ago

No worries; there were no conflicts when it was submitted, but there were definitely a lot of commits flying around so something was bound to happen. I'm happy to resolve the conflicts if that'd be useful.

billygriffin commented 7 years ago

Sorry, I didn't mean to suggest that you created the conflicts! @stvnrlly and I had been working on the same doc and I pushed to master, which created the conflicts. I think I hit all the things you did on the current version, so should be all good now. Thanks again @jehlers!