tree f783960d2dbd7ef488e61b1ffd0ccb2fd72a359d
parent cb8e6ba68438355572e480de2d93adddbfae637e
parent 44ecabb241201c37f94ade36806b2070eca0144c
author trisha-melani <prathapan.pradeepa@gmail.com> 1636052687 +0530
committer trisha-melani <prathapan.pradeepa@gmail.com> 1636052687 +0530

Merge branch 'master' of https://github.com/apache/gora into GORA-692

 Conflicts:
	pom.xml