Automatic snapshot commit from .. at 0ec3f54

Origin repo remote tracking branch: 'origin/master'
Origin repo remote repo URL: 'origin = https://github.com/jgfouca/prototype_external.git'

At commit:

0ec3f54 test conflict 2
Author: James Foucar <jgfouca@sandia.gov>
Date: Tue Nov 4 14:58:22 2014 -0700