OpenTechStrategies / timelines

Template for displaying timelines on the web, using the Simile Timeline widget and and Google Spreadsheets. See http://gov-oss.org/ for an example.
Other
7 stars 5 forks source link

added Google Analytics warning, link to GitHub #2

Closed ghelleks closed 12 years ago

ghelleks commented 12 years ago

...also, a test of our ability to actually merge these branches via PR.

kfogel commented 12 years ago

Gunnar Hellekson reply@reply.github.com writes:

...also, a test of our ability to actually merge these branches via PR.

Seems to have worked this time!

I think I know what happened last time: when you merge a PR, the GitHub UI asks for confirmation, and on the confirmation screen, the confirm button is placed to the upper right of the (editable) PR comment. And in the lower right, where I normally expect a confirmation button to be, is a button to close the PR. So I probably accidentally hit close when I meant to hit confirm-merge.

-K

You can merge this Pull Request by running:

git pull https://github.com/ghelleks/us-govt-open-source master

Or you can view, comment on it, or merge it online at:

https://github.com/OpenTechStrategies/us-govt-open-source/pull/2

-- Commit Summary --

  • added Google Analytics warning, fixed Red Hat spelling
  • added link to github

-- File Changes --

M README.md (8) M oss-timeline.html (5)

-- Patch Links --

https://github.com/OpenTechStrategies/us-govt-open-source/pull/2.patch https://github.com/OpenTechStrategies/us-govt-open-source/pull/2.diff


Reply to this email directly or view it on GitHub: https://github.com/OpenTechStrategies/us-govt-open-source/pull/2