Skip to content
Snippets Groups Projects
Commit b45a3fac authored by Petr Rockai's avatar Petr Rockai
Browse files

tools: Resolve a merge conflict in divcc.

parent 1fe1f0fb
No related branches found
No related tags found
No related merge requests found
......@@ -13,8 +13,7 @@ DIVINE_RELAX_WARNINGS
#include "llvm/MC/MCSectionELF.h"
#include "llvm/MC/MCStreamer.h"
#include "llvm/Support/TargetRegistry.h"
#include "llvm/Support/ELF.h"
#include "llvm/Target/TargetLoweringObjectFile.h"
#include "llvm/BinaryFormat/ELF.h"
#include "llvm/Target/TargetOptions.h"
#include "llvm-c/Target.h"
DIVINE_UNRELAX_WARNINGS
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment