Revert "Revert "fix conflict""

This reverts commit c1f0bdd.
seam · Mar 26, 2011 · cdb7c73 · cdb7c73
1 parent c1f0bdd
commit cdb7c73
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/booking/pom.xml b/booking/pom.xml
@@ -465,13 +465,10 @@
             </build>
         </profile>
 
-<<<<<<< HEAD
-=======
         <profile>
             <id>ftest</id>
         </profile>
 
->>>>>>> 8057fd0acec08e07c69818085ae22111d6a01d87
     </profiles>
 
     <scm>