Add first php file edit file to not show changes

Krutonium · Oct 3, 2018 · 233e416 · 233e416
1 parent dfb4f1b
commit 233e416
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/PHP/OwO.php b/PHP/OwO.php
@@ -0,0 +1,6 @@
+echo "                 *Notices Bulge*"
+echo "__        ___           _    _        _   _     _      "
+echo "\\ \\      / / |__   __ _| |_ ( ) ___  | |_| |__ (_) ___ "
+echo " \\ \\ /\\ / /| '_ \\ / _\\`| __|// / __| | __| '_ \\| |/ __|"
+echo "  \\ V  V / | | | | (_| | |_    \\__ \\ | |_| | | | |\\__ \\"
+echo "   \\_/\\_/  |_| |_|\\__,_|\\__|   |___/ \\___|_| |_|_|/___/"
diff --git a/PHP/owo.php b/PHP/owo.php
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?php
     echo("                 *Notices Bulge*
 __        ___           _    _        _   _     _
@@ -8,11 +7,3 @@
    \_/\_/  |_| |_|\__,_|\__|   |___/ \___|_| |_|_|/___/");
 
 ?>
-=======
-echo "                 *Notices Bulge*"
-echo "__        ___           _    _        _   _     _      "
-echo "\\ \\      / / |__   __ _| |_ ( ) ___  | |_| |__ (_) ___ "
-echo " \\ \\ /\\ / /| '_ \\ / _\\`| __|// / __| | __| '_ \\| |/ __|"
-echo "  \\ V  V / | | | | (_| | |_    \\__ \\ | |_| | | | |\\__ \\"
-echo "   \\_/\\_/  |_| |_|\\__,_|\\__|   |___/ \\___|_| |_|_|/___/"
->>>>>>> upstream/master