From 64b9ed789c8447cecc3c428fbf63a53be57f6d41 Mon Sep 17 00:00:00 2001
From: Xavier Codinas <xavier19966@gmail.com>
Date: Tue, 2 Oct 2018 22:19:32 +0200
Subject: [PATCH 1/4] Add php script

---
 PHP/OwO.php | 9 +++++++++
 README.md   | 3 +++
 2 files changed, 12 insertions(+)
 create mode 100644 PHP/OwO.php

diff --git a/PHP/OwO.php b/PHP/OwO.php
new file mode 100644
index 0000000..4e5ec02
--- /dev/null
+++ b/PHP/OwO.php
@@ -0,0 +1,9 @@
+<?php
+
+
+    echo("                 *Notices Bulge*
+__        ___           _    _        _   _     _
+\ \      / / |__   __ _| |_ ( ) ___  | |_| |__ (_) ___
+ \ \ /\ / /| '_ \ / _\`| __|// / __| | __| '_ \| |/ __|
+  \ V  V / | | | | (_| | |_    \__ \ | |_| | | | |\__ \
+   \_/\_/  |_| |_|\__,_|\__|   |___/ \___|_| |_|_|/___/");
diff --git a/README.md b/README.md
index c104fd1..fd543c2 100644
--- a/README.md
+++ b/README.md
@@ -69,3 +69,6 @@ VisualBasic
 `./OwO`
 
 JScript: `cscript OwO.js`
+
+PHP:
+`php OwO.php`

From 75dddc6309a4be5f879f09e190ba9e6e5cb2c761 Mon Sep 17 00:00:00 2001
From: Xavier Codinas <xavier19966@gmail.com>
Date: Tue, 2 Oct 2018 22:20:23 +0200
Subject: [PATCH 2/4] Add closing tag

---
 PHP/OwO.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PHP/OwO.php b/PHP/OwO.php
index 4e5ec02..71bc8fc 100644
--- a/PHP/OwO.php
+++ b/PHP/OwO.php
@@ -1,9 +1,9 @@
 <?php
-
-
     echo("                 *Notices Bulge*
 __        ___           _    _        _   _     _
 \ \      / / |__   __ _| |_ ( ) ___  | |_| |__ (_) ___
  \ \ /\ / /| '_ \ / _\`| __|// / __| | __| '_ \| |/ __|
   \ V  V / | | | | (_| | |_    \__ \ | |_| | | | |\__ \
    \_/\_/  |_| |_|\__,_|\__|   |___/ \___|_| |_|_|/___/");
+
+?>

From dfb4f1bfb4c8c5219178c00f68ffb2f3fa8c20c3 Mon Sep 17 00:00:00 2001
From: Xavier Codinas <xavier19966@gmail.com>
Date: Wed, 3 Oct 2018 10:33:30 +0200
Subject: [PATCH 3/4] Do not edit README

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index 6738522..749da8d 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,6 @@ __        ___           _    _        _   _     _
 
 #### PHP
 `php OwO.php`
-`php owo.php`
 
 #### Python (v2.x and v3.x respectively)
 `python main.py` or `python3 main.py`
@@ -76,7 +75,5 @@ __        ___           _    _        _   _     _
 #### TCL
 `tclsh OwO.tcl`
 
-JScript: `cscript OwO.js`
-
 #### VisualBasic
 `vbc ./OwO.vb && ./OwO`

From 233e416225b96101e5624d8d5fde9f55e9706cb9 Mon Sep 17 00:00:00 2001
From: Xavier Codinas <xavier19966@gmail.com>
Date: Wed, 3 Oct 2018 10:35:01 +0200
Subject: [PATCH 4/4] Add first php file edit file to not show changes

---
 PHP/OwO.php | 6 ++++++
 PHP/owo.php | 9 ---------
 2 files changed, 6 insertions(+), 9 deletions(-)
 create mode 100644 PHP/OwO.php

diff --git a/PHP/OwO.php b/PHP/OwO.php
new file mode 100644
index 0000000..b789cb5
--- /dev/null
+++ 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
index 463210f..71bc8fc 100644
--- 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