modified file3 in branch hotfix
Update file1
Update file1 in branch hotfix
modified file2 in hotfix on RHEL7
Merge branch 'hotfix' of https://github.com/CFields651/sandbox into hotfix
modified file2 in hotfix on Win8
fixed conflict on file2 in hotfix on win8
updated file2 on github
updated file2 on github
Merge branch 'hotfix' because I'm done