Sitless Firefox compatibility; responsiveness tweaks

uwcse440 / web-cse440-au15

1 stars 14 forks source link

Sitless Firefox compatibility; responsiveness tweaks #187

Closed g-liu closed 8 years ago

g-liu commented 8 years ago

Not sure why this pull request cannot automatically merge, but I want to avoid screwing up my branch again.

jayfo commented 8 years ago

It's a problem because you're still adding commits to an old feature branch. The work in that branch has been merged, so trying to merge it again is creating conflicts. Or something.

I cherry-picked cb87508 into #189, so I think I got your additional work. Please double-check.

Delete this branch. If you have more changes, start a new branch from the current master.

g-liu commented 8 years ago

Thanks James!

I think you missed https://github.com/g-liu/web-cse440-au15/commit/e93c7bb2c701798fdb3d6c6984a2a9489ba2dc99, which contains some more fixes. Let me know if you need me to restore any branches.

jayfo commented 8 years ago

Ok, I grabbed that in #191.