Merge pull request #1 from GrOkkio/my-resume

Resolving merge conflicts
GrOkkio · Apr 7, 2024 · 4a631c2 · 4a631c2
2 parents dea821f + 0d21f08
commit 4a631c2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/references.md b/references.md
@@ -1,3 +1 @@
-# References
-
-* octocat 1 😈
+ciao ciao bambina
diff --git a/resume.md b/resume.md
@@ -2,7 +2,7 @@
 
 Charting the knowledge of the Internet, just like Galileo charted the stars.
 
-## Jobs
+## Job History
 
 ### GitHub Trainer
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     Charting the knowledge of the Internet, just like Galileo charted the stars.
-    ## Jobs
+    ## Job History
     ### GitHub Trainer
@@ Expand Down @@