Letter D added to starwar

Author: NeerajSh-16

Fonts/starwar/starwar.h

@@ -241,8 +241,8 @@ class Starwar : public Fonts
 
             return character;
         }
+    
     */
-
 
         char **R()
         {

example.cpp

@@ -5,12 +5,7 @@ using namespace ascii;
 
 int main()
 {
-<<<<<<< HEAD
     Ascii a = Ascii(starwar);
     a.print("D");
-=======
-    Ascii a = Ascii(straight);
-    a.print("p");
->>>>>>> f71ae0aad9aba0868ed82e85e46f0f6f37b9bbf3
     return 0;
 }