gitignore
ď# Please enter the commit message for your changes. Lines starting
test
porzadki
Merge branch 'master' of https://github.com/sawcioo/PROJEKTAGH

Conflicts:
	Technologie Obiektowe/Projekt/.metadata/.log
	Technologie Obiektowe/Projekt/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.markers.snap
	Technologie Obiektowe/Projekt/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.syncinfo.snap
	Technologie Obiektowe/Projekt/.metadata/.plugins/org.eclipse.core.resources/.projects/SchoolSystem/.markers.snap
	Technologie Obiektowe/Projekt/.metadata/.plugins/org.eclipse.core.resources/.projects/SchoolSystem/.syncinfo.snap
	Technologie Obiektowe/Projekt/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	Technologie Obiektowe/Projekt/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	Technologie Obiektowe/Projekt/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	Technologie Obiektowe/Projekt/.metadata/.plugins/org.eclipse.core.resources/.snap
	Technologie Obiektowe/Projekt/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
	Technologie Obiektowe/Projekt/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	Technologie Obiektowe/Projekt/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	Technologie Obiektowe/Projekt/.metadata/.plugins/org.eclipse.jdt.core/1656589294.index
	Technologie Obiektowe/Projekt/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log