search

karlstolley / 535

Course materials for COM535: Instructional Design
http://karlstolley.github.com/535/
1 stars 6 forks source link

Dev #41

Closed atsansone closed 11 years ago

atsansone commented 11 years ago

Updated pages template with new YAML. Updated page names in Ruby folder.

karlstolley commented 11 years ago

Can you rebase? Looks like there must be some conflicts, as I can't automatically merge this.

ghost commented 11 years ago

OK. Try now.

On Thu, Nov 15, 2012 at 11:16 AM, Karl Stolley notifications@github.comwrote:

Can you rebase? Looks like there must be some conflicts, as I can't automatically merge this.

— Reply to this email directly or view it on GitHubhttps://github.com/karlstolley/535/pull/41#issuecomment-10416669.

karlstolley commented 11 years ago

Still seeing that I can't automatically merge--certain you pulled the lastest master before rebasing?

ghost commented 11 years ago

I saw two duplicate commits of mine, so I rolled that back after the rebase. Try now?

On Thu, Nov 15, 2012 at 12:07 PM, Karl Stolley notifications@github.comwrote:

Still seeing that I can't automatically merge--certain you pulled the lastest master before rebasing?

— Reply to this email directly or view it on GitHubhttps://github.com/karlstolley/535/pull/41#issuecomment-10418681.