Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

[10:40:09 CST(-0600)] <drewwills> and it looked right

[10:40:17 CST(-0600)] <drewwills> but then it refused to push

[10:40:46 CST(-0600)] <drewwills> so i did a git pull origin followed by git merge origin/rel-4-0-patches

[10:41:03 CST(-0600)] <EricDalquist> ah

[10:41:07 CST(-0600)] <drewwills> and then it would push... but it picked up some noise somewhere in there

[10:41:12 CST(-0600)] <EricDalquist> yeah]