-
Notifications
You must be signed in to change notification settings - Fork 178
/
index.php~
37 lines (33 loc) · 1.38 KB
/
index.php~
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
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! meshko1989@mail.ru</p>'; ?>
<?php // echo '<p>Hello World, Aleksander Aleksandrov</p> <br> email:aleksaander_aleksandrov@abv.bg'; ?>
<?php // echo '<p>Hello World, Elena Chavdarova</p> <br> email:elenachavdarova91@gmail.com'; ?>
>>>>>>> refs/heads/master
=======
<?php echo '<p>Hello World from FMI</p>'; ?>
<?php // echo '<p>Hello World from Mihail Kopuschu! meshko1989@mail.ru</p>'; ?>
<?php // echo '<p>Hello World, Aleksander Aleksandrov</p> <br> email:aleksaander_aleksandrov@abv.bg'; ?>
>>>>>>> refs/remotes/git hub remote/master
=======
<?php echo '<p>Hello World from FMI</p>'; ?>
<?php // echo '<p>Hello World from Mihail Kopuschu! meshko1989@mail.ru</p>'; ?>
<?php // echo '<p>Hello World, Aleksander Aleksandrov</p> <br> email:aleksaander_aleksandrov@abv.bg'; ?>
>>>>>>> refs/heads/master
=======
<?php echo '<p>Hello World from FMI</p>'; ?>
<?php // echo '<p>Hello World from Mihail Kopuschu! meshko1989@mail.ru</p>'; ?>
<?php // echo '<p>Hello World, Aleksander Aleksandrov</p> <br> email:aleksaander_aleksandrov@abv.bg'; ?>
>>>>>>> refs/heads/master
</body>
</html>