search

ioos / sos-guidelines-hugo

http://ioos.github.io/sos-guidelines
1 stars 4 forks source link

Update template links to GitHub and fix Capabilities #4

Closed srstsavage closed 9 years ago

dpsnowden commented 9 years ago

@duncombe, can you resolve the conflict? Looks like PR #3 introduced something that makes this PR unable to be merged automatically.

srstsavage commented 9 years ago

Conflicts resolved.

duncombe commented 9 years ago

@dpsnowden. @shane-axiom has fixed it, but I have not write permission on the repository, so I cannot accept his pull request. You will have to do it.

On Sun, Oct 5, 2014 at 10:20 AM, Derrick Snowden notifications@github.com wrote:

@duncombe https://github.com/duncombe, can you resolve the conflict? Looks like PR #3 https://github.com/ioos/sos-guidelines/pull/3 introduced something that makes this PR unable to be merged automatically.

— Reply to this email directly or view it on GitHub https://github.com/ioos/sos-guidelines/pull/4#issuecomment-57937428.

Dr. Christopher M. Duncombe Rae c deirdre.byrne@noaa.gov hristopher.duncombe.rae@noaa.gov Oceanographer / Data Scientist IOOS/NOAA, Suite 1225, 1100 Wayne Avenue, Silver Spring, MD 20910, USA Tel: +1-301-427-2450 Fax: +1-301-427-2073