Merge branch 'M1-S1' into 'M1'

M1 s1 See merge request martin/git101!3

Merge branch 'M1-S1' into 'M1'
12c9636b · Nixon Solomon · 243d3955 · 530e39c5 · 12c9636b · 12c9636b
Commit 12c9636b authored 5 years ago by Nixon Solomon
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

.index.php.swm .index.php.swm +0 -0

.index.php.swn .index.php.swn +0 -0

index.php index.php +2 -0

login.php login.php +1 -0

No files found.
--- a/.index.php.swm
+++ b/.index.php.swm
--- a/.index.php.swn
+++ b/.index.php.swn
--- a/index.php
+++ b/index.php

+BHelloHelloHellO
+CHello
 Hello Team!! 
--- a/login.php
+++ b/login.php
+Hello login!!