Re-do EFF submission in #3 "incorporated edits and changes after internal EFF review" after resolving merge conflict

unitedstates / licensing

Best practices language for making open government data "license-free".

https://theunitedstates.io/licensing/

Creative Commons Zero v1.0 Universal

27 stars 5 forks source link

Re-do EFF submission in #3 "incorporated edits and changes after internal EFF review" after resolving merge conflict #6

Closed konklone closed 10 years ago

konklone commented 10 years ago

I added a link to a URL in the middle of a paragraph that @thisisparker edited, making his PR un-automatically-merge-able. This PR includes his commit, along with a commit of mine fixing that merge error (re-adding the link).

See #3, and the discussion in #1.

konklone commented 10 years ago

Since #3 was agreed on, and this is a copy with non-substantive changes, merging this one in immediately and closing #3.

JoshData commented 10 years ago

::dance:: :dancers: :dancer:

I'm updating the title/descr of this pullreq just for the historical record.

konklone commented 10 years ago

Thanks. I updated your comment text with emoji for maximum historical precision.

JoshData commented 10 years ago

haha