Florian/1ereNSI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

résolution conflit gitea gitlab

Browse Source
This commit is contained in:
Florian Mathieu
2024-06-06 15:10:44 +02:00
parent 15e3a34ab1 94a7dc370e
commit 75b03a5165
3 changed files with 165 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -1,3 +1,4 @@
<<<<<<< HEAD
# Cours NSI
## Découpage
@@ -39,3 +40,8 @@
- [Gitlab de David Landry](https://gitlab.com/david_landry/nsi)
- [Framagit de Christophe Mieszczak](https://framagit.org/tofmzk/informatique_git/-/tree/master/premiere_nsi)
- [Site de David Roche](https://pixees.fr/informatiquelycee/n_site/nsi_prem.html)
=======
# 1ere_NSI
Cours de première NSI de Florian Mathieu
>>>>>>> gitea/main