diff --git a/VERSION.json b/VERSION.json index a78ee916..ef7cd0ab 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1,3 +1,7 @@ Version:1.0.1 +<<<<<<< HEAD Snapshot:5 +======= +Snapshot:4 +>>>>>>> 239236a19dca4ea087eddbe5b04618b2fe70a0fd ReleaseNote: