Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolving merge conflicts #1

Merged
merged 9 commits into from
Aug 20, 2024
Merged

Resolving merge conflicts #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f8608da
Update resume.md in my-resume
github-actions[bot] Aug 19, 2024
783c098
Update to 1 in STEP and README.md
github-actions[bot] Aug 19, 2024
e3e3a29
Update step in my-resume
github-actions[bot] Aug 19, 2024
6dd8845
Update to 2 in STEP and README.md
github-actions[bot] Aug 19, 2024
d0cf861
Merge branch 'main' into my-resume
Ahmed-Limem Aug 20, 2024
6bf5e33
Update to 3 in STEP and README.md
github-actions[bot] Aug 20, 2024
b94d20b
Create a =/= references.md
Ahmed-Limem Aug 20, 2024
d954aad
Update to 4 in STEP and README.md
github-actions[bot] Aug 20, 2024
d1d3766
Merge branch 'main' into my-resume
Ahmed-Limem Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion references.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# References

* octocat 1 😈
* octocat 1 😈

2 changes: 1 addition & 1 deletion resume.md
View file
Open in desktop
Original file line number Diff 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