Versions Compared

Old Version 36

changes.mady.by.user Apereo Infrastructure

Saved on

compared with

New Version Current

changes.mady.by.user Apereo Infrastructure

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Corrected links that should have been relative instead of absolute.

...

[16:58:29 CST(-0600)] <EricDalquist> the real question is what happens when I merge 4.0.4 since our myuw branch will have fixes that are also going to be in 4.0.4

[16:58:36 CST(-0600)] <athena> yeah

[16:58:41 CST(-0600)] <EricDalquist> is git smart enough to deal with that

[16:58:44 CST(-0600)] <EricDalquist> I'm betting it is

[16:58:47 CST(-0600)] <athena> (smile)

[17:05:31 CST(-0600)] <EricDalquist> does landis work for unicon?

[17:08:32 CST(-0600)] <holdorph> yes

[17:08:47 CST(-0600)] <EricDalquist> just curious (smile)