csrv200 improvements

2020-07-10 03:16:08 +02:00
parent bdc6e88198
commit 9cbc1a18b8
2 changed files with 26 additions and 35 deletions
--- a/storagemanager/StorageAccessor.h
+++ b/storagemanager/StorageAccessor.h
@ -25,8 +25,13 @@ public:
 	 * @param
 	 * @return
 	 */
+<<<<<<< Updated upstream
 	StorageAccessor& operator= (StorageAccessor&&);
 	StorageAccessor (StorageAccessor&&);
+=======
+	StorageAccessor& operator=(StorageAccessor&&);
+	StorageAccessor(StorageAccessor&&);
+>>>>>>> Stashed changes

 	ReturnValue_t write(uint8_t *data, size_t size,
 		uint16_t offset = 0);