...
[15:32:50 CDT(-0500)] <sjungling> correct
[15:32:55 CDT(-0500)] <sjungling> i have 4.0.6 running on a dev server
[15:33:12 CDT(-0500)] <sjungling> but it was after attempting to move personDirs over to caching that i started seeing these errors
[15:33:18 CDT(-0500)] <sjungling> 4.0.6 merged automatically
[15:33:22 CDT(-0500)] <EricDalquist> hrm
[15:33:32 CDT(-0500)] <sjungling> it did report a few conflicts:
[15:33:32 CDT(-0500)] <sjungling> Conflicts:
[15:33:32 CDT(-0500)] <sjungling> uportal-ear/pom.xml
[15:33:32 CDT(-0500)] <sjungling> uportal-war/src/main/resources/properties/contexts/datasourceContext.xml
[15:33:32 CDT(-0500)] <sjungling> uportal-war/src/main/resources/properties/contexts/personDirectoryContext.xml
[15:33:33 CDT(-0500)] <sjungling> but git automerged