Merge branch 'master' of https://github.com/Insper/open-dev

cedmenezes · cedmenezes · commit 3ea14e844af4 · 2025-08-18T17:21:10.000-03:00
diff --git a/students/joaopgs4-achievements b/students/joaopgs4-achievements
@@ -1 +1,5 @@
-gAAAAABoo4iOTC5TjMl3kxD_zJLZylIKYNPaJd6-GoYwTKf_2Zm_pSubzqIaYc3rianUfxKB8FkYDaz0WIxzQok-Ms0Fx036_w==
+<<<<<<< HEAD
+gAAAAABoo4iOTC5TjMl3kxD_zJLZylIKYNPaJd6-GoYwTKf_2Zm_pSubzqIaYc3rianUfxKB8FkYDaz0WIxzQok-Ms0Fx036_w==
+=======
+gAAAAABoo4kzlusavf_WwfFcKGyqcjIwmzSJY0ov8PO_og_fI3WtHWy910p2R2warCmA-2wGp4m75xCUb2iPeDjox3DTEijlpgzZYbOgQk4HupLfe8j92M9EZO1ifeqAjG263M1WKzIUR52PbZfdKh01d7_NnPN2jA==
+>>>>>>> ae94d4ecfef92d4290245d57aebe2dcaf20231d3
