3/4 de la documentation

Persistance/DataContractPersistance.cs

@@ -84,10 +84,6 @@ namespace Persistance
             {
                 Directory.CreateDirectory(FileUsers);
             }
-<<<<<<< HEAD
-=======
-
->>>>>>> f79cc84ec64719156200f8831edf89df635c12a9
             data.Users.Clear();
             data.Experts.Clear();
             data.Users.AddRange(users);
@@ -129,10 +125,7 @@ namespace Persistance
                 Directory.CreateDirectory(FilePath);
             }
 
-<<<<<<< HEAD
 
-=======
->>>>>>> f79cc84ec64719156200f8831edf89df635c12a9
             dataReq.Requins.Clear();
             dataReq.RequinsAdd.Clear();
             dataReq.RequinsEdit.Clear();

WpfApp1/Persistance/ficReqs

@@ -40,7 +40,6 @@
       <d2p1:StatutCons>EW</d2p1:StatutCons>
       <d2p1:Video>Videos/Vid-Requin-Blanc.mp4</d2p1:Video>
     </d2p1:Requin>
-<<<<<<< HEAD
     <d2p1:Requin>
       <d2p1:Description>wow il est trop joli</d2p1:Description>
       <d2p1:FunFact>(C'est pas un vrai requin)</d2p1:FunFact>
@@ -68,8 +67,6 @@
       <d2p1:StatutCons>VU</d2p1:StatutCons>
       <d2p1:Video>Videos/Vid-Requin-Blanc.mp4</d2p1:Video>
     </d2p1:Requin>
-=======
->>>>>>> f79cc84ec64719156200f8831edf89df635c12a9
   </Requins>
   <RequinsAdd xmlns:d2p1="http://schemas.datacontract.org/2004/07/Mod%C3%A8le" />
   <RequinsEdit xmlns:d2p1="http://schemas.datacontract.org/2004/07/Mod%C3%A8le">

WpfApp1/Persistance/ficUsers

@@ -14,7 +14,6 @@
       <d2p1:MotDePasse>salut</d2p1:MotDePasse>
       <d2p1:NbSubmit>3</d2p1:NbSubmit>
     </d2p1:Utilisateur>
-<<<<<<< HEAD
     <d2p1:Utilisateur>
       <d2p1:Email>bernard@gmail.com</d2p1:Email>
       <d2p1:MotDePasse>bernie</d2p1:MotDePasse>
@@ -25,7 +24,5 @@
       <d2p1:MotDePasse>lol</d2p1:MotDePasse>
       <d2p1:NbSubmit>0</d2p1:NbSubmit>
     </d2p1:Utilisateur>
-=======
->>>>>>> f79cc84ec64719156200f8831edf89df635c12a9
   </Users>
 </DataToPersistUsers>