summaryrefslogtreecommitdiff
path: root/zen/file_error.h
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-05-17 17:14:47 +0000
committerB Stack <bgstack15@gmail.com>2020-05-17 17:14:47 +0000
commitcca3f71f16f85f5d506bf4bb7b3ec38fda31516a (patch)
tree1f52055b2f26fc2389d3ab4eb8d8d1e234a6316a /zen/file_error.h
parentMerge branch '10.23' into 'master' (diff)
parentadd upstream 10.24 (diff)
downloadFreeFileSync-cca3f71f16f85f5d506bf4bb7b3ec38fda31516a.tar.gz
FreeFileSync-cca3f71f16f85f5d506bf4bb7b3ec38fda31516a.tar.bz2
FreeFileSync-cca3f71f16f85f5d506bf4bb7b3ec38fda31516a.zip
Merge branch '10.24' into 'master'
add upstream 10.24 See merge request opensource-tracking/FreeFileSync!21
Diffstat (limited to 'zen/file_error.h')
-rw-r--r--zen/file_error.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/zen/file_error.h b/zen/file_error.h
index 55935eba..b9ce9419 100644
--- a/zen/file_error.h
+++ b/zen/file_error.h
@@ -7,9 +7,7 @@
#ifndef FILE_ERROR_H_839567308565656789
#define FILE_ERROR_H_839567308565656789
-#include <string>
#include "zstring.h"
-#include "utf.h"
#include "sys_error.h" //we'll need this later anyway!
bgstack15