tree f6c65ddb777bf9c9640ff5f74de220f09e1e04dd
parent 49463d2a0b1de832c5186a757eb40d1ffc4d1b24
author Adam Faris <afaris@linkedin.com> 1617326918 -0700
committer GitHub <noreply@github.com> 1617326918 -0700
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsBcBAABCAAQBQJgZnNGCRBK7hj4Ov3rIwAAdHIIAKkTgOIKrgTbe8pui9XN2196
 bsgI2/yRX0pmmP3P00z+o7Xcsb+ORGBKCQLBBbdwswcbRYRgaytA1QL/X792rZiE
 TADhwScQnWCFs9UuRjxKmcntUpGO2bdCbISq+woT2m9FVp5OyeGEDzy0sItS3Svk
 NpZKSKSND79/7GPiAlp3GXD3DwC7D7dsxH2hRbMQfHhkyYRpVG06Cpfz/TvjzBz2
 xeoTNSJIwUmL5ZOPjVkPVp0+Uw2lPpDMsRhJ7U4aKZEMFX+/ajUIFimj6bBOSnv2
 dJPctJxNqA3Df3ygQtChWKSEb22BRZl7qYmHAnTQdKkppnkYh3kEfef+U6hby1Y=
 =QsHM
 -----END PGP SIGNATURE-----
 

remove comited merge conflict. (#83)

A merge conflict was checked in by mistake.  This change removes the conflict & changes the hello-samza version to 1.6