projekat
123
12
Merge branch 'develop' of https://github.com/kenal/MaasFaktura into develop

Conflicts:
	Servis/Desktop/bin/Debug/Desktop.application
	Servis/Desktop/bin/Debug/Desktop.exe
	Servis/Desktop/bin/Debug/Desktop.exe.manifest
	Servis/Desktop/bin/Debug/Desktop.pdb
	Servis/Desktop/bin/Debug/Desktop.vshost.application
	Servis/Desktop/bin/Debug/Desktop.vshost.exe.manifest
	Servis/Desktop/bin/Debug/WpfScheduler.dll
	Servis/Desktop/bin/Debug/WpfScheduler.pdb
	Servis/Desktop/bin/Debug/app.publish/Desktop.exe
	Servis/Desktop/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Servis/Desktop/obj/Debug/Desktop.application
	Servis/Desktop/obj/Debug/Desktop.csprojResolveAssemblyReference.cache
	Servis/Desktop/obj/Debug/Desktop.exe
	Servis/Desktop/obj/Debug/Desktop.exe.manifest
	Servis/Desktop/obj/Debug/Desktop.pdb
	Servis/Desktop/obj/Debug/Desktop_MarkupCompile.i.cache
	Servis/Servis.v12.suo
	Servis/WpfScheduler/bin/Debug/WpfScheduler.dll
	Servis/WpfScheduler/bin/Debug/WpfScheduler.pdb
	Servis/WpfScheduler/bin/Release/WpfScheduler.dll
	Servis/WpfScheduler/bin/Release/WpfScheduler.pdb
	Servis/WpfScheduler/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	Servis/WpfScheduler/obj/Debug/WpfScheduler.dll
	Servis/WpfScheduler/obj/Debug/WpfScheduler.pdb
	Servis/WpfScheduler/obj/Release/WpfScheduler.dll
	Servis/WpfScheduler/obj/Release/WpfScheduler.pdb
12
Merge branch 'develop' of https://github.com/kenal/MaasFaktura into develop

Conflicts:
	Servis/Desktop/bin/Debug/Desktop.exe
	Servis/Desktop/bin/Debug/Desktop.pdb
	Servis/Desktop/bin/Debug/Mass.Data.dll
	Servis/Desktop/bin/Debug/Mass.Data.pdb
	Servis/Desktop/bin/Debug/Service.dll
	Servis/Desktop/bin/Debug/Service.pdb
	Servis/Desktop/obj/Debug/AngebotWindow.baml
	Servis/Desktop/obj/Debug/AngebotWindow.g.cs
	Servis/Desktop/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Servis/Desktop/obj/Debug/Desktop.csproj.FileListAbsolute.txt
	Servis/Desktop/obj/Debug/Desktop.csproj.GenerateResource.Cache
	Servis/Desktop/obj/Debug/Desktop.csprojResolveAssemblyReference.cache
	Servis/Desktop/obj/Debug/Desktop.exe
	Servis/Desktop/obj/Debug/Desktop.g.resources
	Servis/Desktop/obj/Debug/Desktop.pdb
	Servis/Desktop/obj/Debug/Desktop_MarkupCompile.cache
	Servis/Desktop/obj/Debug/Desktop_MarkupCompile.i.cache
	Servis/Desktop/obj/Debug/Desktop_MarkupCompile.i.lref
	Servis/Desktop/obj/Debug/Desktop_MarkupCompile.lref
	Servis/Mass.Data/bin/Debug/Mass.Data.dll
	Servis/Mass.Data/bin/Debug/Mass.Data.pdb
	Servis/Mass.Data/obj/Debug/Mass.Data.csproj.FileListAbsolute.txt
	Servis/Mass.Data/obj/Debug/Mass.Data.dll
	Servis/Mass.Data/obj/Debug/Mass.Data.pdb
	Servis/MassService/Desktop/bin/Debug/app.publish/Desktop.exe
	Servis/Service/bin/Mass.Data.dll
	Servis/Service/bin/Mass.Data.pdb
	Servis/Service/bin/Service.dll
	Servis/Service/bin/Service.pdb
	Servis/Service/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Servis/Service/obj/Debug/Service.csproj.FileListAbsolute.txt
	Servis/Service/obj/Debug/Service.csprojResolveAssemblyReference.cache
	Servis/Service/obj/Debug/Service.dll
	Servis/Service/obj/Debug/Service.pdb
	Servis/Servis.v12.suo
	Servis/WpfScheduler/obj/Debug/DayScheduler.g.cs
	Servis/WpfScheduler/obj/Debug/DayScheduler.g.i.cs

	Servis/WpfScheduler/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Servis/WpfScheduler/obj/Debug/GeneratedInternalTypeHelper.g.i.cs
	Servis/WpfScheduler/obj/Debug/MonthDay.g.cs
	Servis/WpfScheduler/obj/Debug/MonthDay.g.i.cs
	Servis/WpfScheduler/obj/Debug/MonthScheduler.g.cs
	Servis/WpfScheduler/obj/Debug/MonthScheduler.g.i.cs
	Servis/WpfScheduler/obj/Debug/Scheduler.g.cs
	Servis/WpfScheduler/obj/Debug/Scheduler.g.i.cs
	Servis/WpfScheduler/obj/Debug/WeekScheduler.g.cs
	Servis/WpfScheduler/obj/Debug/WeekScheduler.g.i.cs
	Servis/WpfScheduler/obj/Debug/WpfScheduler.csproj.FileListAbsolute.txt

	Servis/WpfScheduler/obj/Debug/WpfScheduler.csproj.GenerateResource.Cache
	Servis/WpfScheduler/obj/Debug/WpfScheduler.dll
	Servis/WpfScheduler/obj/Debug/WpfScheduler.pdb
	Servis/WpfScheduler/obj/Debug/WpfScheduler_MarkupCompile.cache
	Servis/WpfScheduler/obj/Debug/WpfScheduler_MarkupCompile.i.cache
	Servis/WpfScheduler/obj/Debug/WpfScheduler_MarkupCompile.lref