made notebook.html extend layout.html

[hhuuggoo]

Conflicts:

IPython/frontend/html/notebook/templates/notebook.html

[fperez]

For reference, this is a restart with a clean branch of #1278, where more discussion can be found.

[fperez]

Ooops, @hhuuggoo: sorry to say this, but it seems that in the meantime this one developed a conflict and doesn't merge cleanly. Could you please rebase it on top of master and push again (you'll need to use git push --force)? You'll have to fix some conflicts, but I think they should be pretty minimal.

Please let us know if you need a hand...

We'll do our best to review it quickly after the rebase so that this doesn't happen again.

[ellisonbg]

@hhuuggoo, can you rebase this so we can finish the review?

[hhuuggoo]

yes sorry, I'll take care of it this weekend.

On 01/27/2012 12:52 PM, Brian E. Granger wrote:

@hhuuggoo, can you rebase this so we can finish the review?

---

Reply to this email directly or view it on GitHub:
#1299 (comment)