<<<<<<< HEAD <<<<<<< HEAD containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

markdown text expanded to 800x400

:= 5 ||||||| parent of 33280fed5 (fixed e2e tests) containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

markdown text expanded to 800x400

:= 5 ======= containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

markdown text expanded to 800x400

||||||| parent of cb2f2823c (Fix changes) containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

markdown text expanded to 800x400

======= containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

markdown text expanded to 800x400

>>>>>>> cb2f2823c (Fix changes)
:= 5 >>>>>>> 33280fed5 (fixed e2e tests) := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 fmt.Printf("%d", b):= 5 := a + 7 <<<<<<< HEAD fmt.Printf("%d", b)a := 5 b := a + 7 fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval ||||||| parent of 33280fed5 (fixed e2e tests) fmt.Printf("%d", b)a := 5 b := a + 7 fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval ======= fmt.Printf("%d", b)a := 5 b := a + 7 fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval >>>>>>> 33280fed5 (fixed e2e tests)