forked from wingman007/fmi
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
gzekiii
authored and
gzekiii
committed
Feb 15, 2013
1 parent
40107fb
commit 009aa52
Showing
2 changed files
with
37 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,35 +3,8 @@ | |
| <title>Hello World</title> | ||
| </head> | ||
| <body> | ||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| <?php echo '<p>Hello World</p>'; ?> | ||
| ======= | ||
| <?php echo '<p>Hello World from FMI</p>'; ?> | ||
| <?php // echo '<p>Hello World from Mihail Kopuschu! [email protected]</p>'; ?> | ||
| <?php // echo '<p>Hello World, Aleksander Aleksandrov</p> <br> email:[email protected]'; ?> | ||
| <?php // echo '<p>Hello World, Elena Chavdarova</p> <br> email:[email protected]'; ?> | ||
|
|
||
| >>>>>>> refs/heads/master | ||
| ======= | ||
| <?php echo '<p>Hello World from FMI</p>'; ?> | ||
| <?php // echo '<p>Hello World from Mihail Kopuschu! [email protected]</p>'; ?> | ||
| <?php // echo '<p>Hello World, Aleksander Aleksandrov</p> <br> email:[email protected]'; ?> | ||
|
|
||
| >>>>>>> refs/remotes/git hub remote/master | ||
| ======= | ||
| <?php echo '<p>Hello World from FMI</p>'; ?> | ||
| <?php // echo '<p>Hello World from Mihail Kopuschu! [email protected]</p>'; ?> | ||
| <?php // echo '<p>Hello World, Aleksander Aleksandrov</p> <br> email:[email protected]'; ?> | ||
|
|
||
| >>>>>>> refs/heads/master | ||
| ======= | ||
| <?php echo '<p>Hello World from FMI</p>'; ?> | ||
| <?php // echo '<p>Hello World from Mihail Kopuschu! [email protected]</p>'; ?> | ||
| <?php // echo '<p>Hello World, Aleksander Aleksandrov</p> <br> email:[email protected]'; ?> | ||
|
|
||
| >>>>>>> refs/heads/master | ||
| </body> | ||
| </html> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| <html> | ||
| <head> | ||
| <title>Hello World</title> | ||
| </head> | ||
| <body> | ||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| <?php echo '<p>Hello World</p>'; ?> | ||
| ======= | ||
| <?php echo '<p>Hello World from FMI</p>'; ?> | ||
| <?php // echo '<p>Hello World from Mihail Kopuschu! [email protected]</p>'; ?> | ||
| <?php // echo '<p>Hello World, Aleksander Aleksandrov</p> <br> email:[email protected]'; ?> | ||
| <?php // echo '<p>Hello World, Elena Chavdarova</p> <br> email:[email protected]'; ?> | ||
|
|
||
| >>>>>>> refs/heads/master | ||
| ======= | ||
| <?php echo '<p>Hello World from FMI</p>'; ?> | ||
| <?php // echo '<p>Hello World from Mihail Kopuschu! [email protected]</p>'; ?> | ||
| <?php // echo '<p>Hello World, Aleksander Aleksandrov</p> <br> email:[email protected]'; ?> | ||
|
|
||
| >>>>>>> refs/remotes/git hub remote/master | ||
| ======= | ||
| <?php echo '<p>Hello World from FMI</p>'; ?> | ||
| <?php // echo '<p>Hello World from Mihail Kopuschu! [email protected]</p>'; ?> | ||
| <?php // echo '<p>Hello World, Aleksander Aleksandrov</p> <br> email:[email protected]'; ?> | ||
|
|
||
| >>>>>>> refs/heads/master | ||
| ======= | ||
| <?php echo '<p>Hello World from FMI</p>'; ?> | ||
| <?php // echo '<p>Hello World from Mihail Kopuschu! [email protected]</p>'; ?> | ||
| <?php // echo '<p>Hello World, Aleksander Aleksandrov</p> <br> email:[email protected]'; ?> | ||
|
|
||
| >>>>>>> refs/heads/master | ||
| </body> | ||
| </html> |