# Conflicts:
#	target/classes/application.properties
#	target/classes/database/MongoDBInteraction.class
#	target/classes/object_detection/ObjectDetector.class
#	target/classes/object_detection/types/CameraIntrinsics.class
#	target/classes/object_detection/types/Frame.class
#	target/classes/object_detection/types/ObjectSet.class
#	target/classes/templates/js/buildPC.js
#	target/classes/top/BackendJava$BackendService.class
#	target/classes/top/BackendJava$ObjectSetController.class
#	target/classes/top/BackendJava$WebMvcConfig.class
#	target/classes/top/BackendJava.class
#	target/classes/vid2frames/Vid2Frames.class
#	target/classes/yolo/YOLODetector.class
#	target/classes/yolo/YOLONet$ObjectDetectionResult.class
#	target/classes/yolo/YOLONet.class

Revert "Merge branch 'revert-7babb541' into 'master'"

See merge request ec504/ec504_projects/group8!33

This reverts merge request !32

Revert "resolved errors scene on lab machine"

See merge request ec504/ec504_projects/group8!32

This reverts commit 7babb541

Rgbd 2

See merge request ec504/ec504_projects/group8!30

old data

See merge request ec504/ec504_projects/group8!29