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

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

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

Kamera

Michael Pilhoefer 1 year ago

parent

d06a1dd9b3 0b1eaee31d

commit

abe79b1efe

1 changed files with 4 additions and 0 deletions

Split View Show Diff Stats

						
							+ 4
							
							- 0
						
app/src/main/java/com/example/greenwatch/Kamera.javaView File
								
			@@ -0,0 +1,4 @@
		
			package com.example.greenwatch;
		
			public class Kamera {
		
			}