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

# Conflicts: # app/src/main/java/com/example/greenwatch/Kamera.java
2023-05-30 18:38:58 +02:00 · 2023-05-30 18:38:58 +02:00 · abe79b1efe
commit abe79b1efe
parent d06a1dd9b3 0b1eaee31d
1 changed files with 4 additions and 0 deletions
--- a/app/src/main/java/com/example/greenwatch/Kamera.java
+++ b/app/src/main/java/com/example/greenwatch/Kamera.java
@ -0,0 +1,4 @@
+package com.example.greenwatch;
+
+public class Kamera {
+}