Commit 86587702 authored by Адлан Шамавов's avatar Адлан Шамавов
Browse files

Merge branch 'main' into 'PTPS_Function_8' 

# Conflicts:
#   index.php
#   src/Functions.php
parents 5c3550e5 5b335147

index.php

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


    $func = new Functions();



    $func = new Functions();

?>



<!DOCTYPE html>

public/text.txt

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
Раз, два, три, четыре,

Пять, шесть, семь, восемь.
 
 No newline at end of file