merge conflict

codewithnick · Oct 30, 2023 · a993c21 · a993c21
1 parent 59b66de
commit a993c21
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 36 deletions.
diff --git a/Fonts/drpepper/drpepper.h b/Fonts/drpepper/drpepper.h
@@ -275,10 +275,6 @@ class Drpepper : public Fonts
 
     char **Y()
     {
- main
-
-
- main
         char **character = getCharGrid(4, 5);
         // Enter the character grid in ROWS X COLS
         character[0][1] = character[0][3] = character[3][2] = '_';
@@ -361,40 +357,32 @@ class Drpepper : public Fonts
     */
 
     /*
- 
-        char **f()
-        {
-            char **character = getCharGrid(rows,cols);
-
-            //Enter the character grid in ROWS X COLS
 
          char **f()
          {
              char **character = getCharGrid(rows,cols);
 
              //Enter the character grid in ROWS X COLS
- 
+
 
              return character;
          }
      */
 
-
-        char **g()
-        {
-            char **character = getCharGrid(5,5);
+    char **g()
+    {
+        char **character = getCharGrid(5, 5);
 
-            //Enter the character grid in ROWS X COLS
-            character[1][1] = character[1][2] = character[1][3] = character[3][1] = character[4][1] = character[4][2] = character[4][3] = character[3][1] = '_';
-            character[2][4] = character[3][4] = '|';
-            character[2][2] = character[3][2] = '.';
-            character[3][0] = '\\';
-            character[2][0] = '/';
-            character[4][0] = '<';
-            character[4][4] = '\'';
-            return character;
-        }
-
+        // Enter the character grid in ROWS X COLS
+        character[1][1] = character[1][2] = character[1][3] = character[3][1] = character[4][1] = character[4][2] = character[4][3] = character[3][1] = '_';
+        character[2][4] = character[3][4] = '|';
+        character[2][2] = character[3][2] = '.';
+        character[3][0] = '\\';
+        character[2][0] = '/';
+        character[4][0] = '<';
+        character[4][4] = '\'';
+        return character;
+    }
 
     char **h()
     {
@@ -523,7 +511,6 @@ class Drpepper : public Fonts
 
     */
 
-
     /*
         char **s()
         {
@@ -536,7 +523,6 @@ class Drpepper : public Fonts
 
     */
 
-
     char **s()
     {
         char **character = getCharGrid(5, 5);
@@ -548,7 +534,6 @@ class Drpepper : public Fonts
         return character;
     }
 
-
     char **t()
     {
         char **character = getCharGrid(4, 5);
@@ -615,12 +600,8 @@ class Drpepper : public Fonts
 
     */
 
-
     // Numbers
 
-
-
-
     char **zero()
     {
         char **character = getCharGrid(4, 5);

diff --git a/example.cpp b/example.cpp
@@ -8,9 +8,6 @@ int main()
 
     Ascii font = Ascii(drpepper);
     font.print("Ag");
-
-    Ascii font = Ascii(banner);
-    font.print("g");
 
     return 0;
 }