#59 : �🩹 fix: more conflict fixing

Sources/Data/Stub.cs

@@ -73,24 +73,6 @@ namespace Data
             return list;
         }
 
-<<<<<<< HEAD
-        public static List<AbstractDie> LoadDices()
-        {
-            List<AbstractDie> list = new()
-            {
-                new AbstractDie("Dice 1"),
-                new AbstractDie("Dice 1"),
-                new AbstractDie("Dice 1"),
-                new AbstractDie("Dice 1"),
-                new AbstractDie("Dice 1"),
-                new AbstractDie("Dice 1")
-            };
-
-            return list;
-        }
-
-=======
->>>>>>> main
         public static List<NumberDieFace> LoadNumFaces()
         {
             List<NumberDieFace> list = new()

Sources/Model/Dice/AbstractDie.cs

@@ -1,18 +1,18 @@
 using System.Collections.Generic;
 
-namespace Model
+namespace Model.Dice
 {
     public abstract class AbstractDie<T> where T : AbstractDieFace
     {
         protected string Name;
-        public  IEnumerable<T> ListFaces  => listFaces; 
+        public IEnumerable<T> ListFaces => listFaces;
 
-        private readonly List<T> listFaces =new();
+        private readonly List<T> listFaces = new();
 
         public AbstractDie(string name, params T[] faces)
         {
-            this.Name = name;
+            Name = name;
-            listFaces.AddRange(faces) ;
+            listFaces.AddRange(faces);
         }
 
 

Sources/Model/Dice/ColorDie.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Model
+namespace Model.Dice
 {
     public class ColorDie : AbstractDie<ColorDieFace>
     {

Sources/Model/Dice/ImageDie.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Model
+namespace Model.Dice
 {
     public class ImageDie : AbstractDie<ImageDieFace>
     {

Sources/Model/Dice/NumberDie.cs

@@ -4,18 +4,18 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Model
+namespace Model.Dice
 {
     public class NumberDie : AbstractDie<NumberDieFace>
     {
 
-        public NumberDie(string name, params NumberDieFace[] faces ) : base(name,faces)
+        public NumberDie(string name, params NumberDieFace[] faces) : base(name, faces)
         {
         }
         public override NumberDieFace GetRandomFace()
         {
             Random rnd = new();
-            int faceIndex = rnd.Next(1, ListFaces.Count()+1);
+            int faceIndex = rnd.Next(1, ListFaces.Count() + 1);
             return ListFaces.ElementAt(faceIndex);
 
         }