extra merge things
This commit is contained in:
parent
abfac25d81
commit
a146375bf8
|
@ -0,0 +1,10 @@
|
|||
<html>
|
||||
<head>
|
||||
<title>403 Forbidden</title>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<p>Directory access is forbidden.</p>
|
||||
|
||||
</body>
|
||||
</html>
|
File diff suppressed because it is too large
Load Diff
|
@ -1,10 +1,6 @@
|
|||
<?php
|
||||
/* ----------------------------------------------------------------------------
|
||||
<<<<<<< HEAD
|
||||
* Easy!Appointments - Online Appointment Scheduler
|
||||
=======
|
||||
* İFL Randevu (fork of easy_appointments) - Open Source Web Scheduler
|
||||
>>>>>>> master
|
||||
*
|
||||
* @package EasyAppointments
|
||||
* @author A.Tselegidis <alextselegidis@gmail.com>
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue