merge patches from daniel to fix merge artifact and test failure

[apt.git] / ftparchive / override.cc

diff --git a/ftparchive/override.cc b/ftparchive/override.cc
index d363fd0fe9830a5510ef8aea848f960b346020aa..760c201200c1d0d7a8d21380ad79983941927cfd 100644 (file)
--- a/ftparchive/override.cc
+++ b/ftparchive/override.cc
@@ -12,13 +12,14 @@
 // Include Files                                                       /*{{{*/
 #include <config.h>
 
 // Include Files                                                       /*{{{*/
 #include <config.h>
 

-#include <apti18n.h>

 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 
 #include <stdio.h>
 
 #include "override.h"
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 
 #include <stdio.h>
 
 #include "override.h"

+
+#include <apti18n.h>

                                                                        /*}}}*/
 
 // Override::ReadOverride - Read the override file                     /*{{{*/
                                                                        /*}}}*/
 
 // Override::ReadOverride - Read the override file                     /*{{{*/