deplace #include <tango.h> due to conflict between tango7/ACE

pom.xml

@@ -8,7 +8,7 @@
    </parent>
    <groupId>fr.soleil.device</groupId>
    <artifactId>PulseGeneration-${aol}-${mode}</artifactId>
-   <version>1.1.6</version>
+   <version>1.1.7</version>
    <packaging>nar</packaging>
    <name>PulseGeneration</name>
    <description>PulseGeneration device</description>

src/PulseGeneration.h

@@ -23,13 +23,13 @@
 #ifndef _RETRIGGERABLESINGLEPULSEGENERATION_H
 #define _RETRIGGERABLESINGLEPULSEGENERATION_H
 
-//#include <tango.h>
+#include <tango.h>
 //using namespace Tango;
 #include "ni660Xsl/OutputOperation.h"
 #include "ni660Xsl/RetriggerablePulseTrainGeneration.h"
 #include "ni660Xsl/ContinuousPulseTrainGeneration.h"
 #include "ni660Xsl/FinitePulseTrainGeneration.h"
-#include <tango.h>
+
 /**
  * @author	$Author: abeilleg $
  * @version	$Revision: 1.8 $ $