Development - #5

Open

dorisakoto wants to merge 14 commits into

dorisakoto:development

Commits on Jan 27, 2025

added text file
dorisakoto
committed
a5431e5
Merge branch 'main' of github.com:sissa/ScientificPython_diploma25
dorisakoto
committed
5f13920
Merge pull request #1 from dorisakoto/development
dorisakoto
authored
3abd281
ediited file
dorisakoto
committed
0bd200c
Delete doristextfile.txt
dorisakoto
authored
e3d1fec
Delete doristextfile.txt
dorisakoto
authored
cdcfa01
Delete doristextfile.txt
dorisakoto
authored
404920d
editted file
dorisakoto
committed
a42250c
editted file
dorisakoto
committed
929ea50
editted file
dorisakoto
committed
da5e4b5
second editted file
dorisakoto
committed
1c74a20
trying to solve conflict
dorisakoto
committed
6f66b84
Merge branch 'new_branch' into development
dorisakoto
committed
065a231
third edit
dorisakoto
committed
b46157c