Merge remote-tracking branch 'origin/Kamera' into Kamera · abe79b1efe - mMDT5_GreenWatch - Fakultät Elektrotechnik Feinwerktechnik Informationstechnik

bauseweinfr74630/mMDT5_GreenWatch

Merge remote-tracking branch 'origin/Kamera' into Kamera

# Conflicts:
#	app/src/main/java/com/example/greenwatch/Kamera.java

This commit is contained in:

pilhoefermi93253

2023-05-30 18:38:58 +02:00

parent d06a1dd9b3 0b1eaee31d

commit abe79b1efe

1 changed files with 4 additions and 0 deletions

									
										app/src/main/java/com/example/greenwatch/Kamera.java
									
		+4
		
												View File
												
					@@ -0,0 +1,4 @@

					package com.example.greenwatch;

					public class Kamera {

					}