* Code clean up

src/polyorb_hi-unprotected_queue.adb

@@ -30,16 +30,11 @@
 ------------------------------------------------------------------------------
 
 with PolyORB_HI.Output;
-with PolyORB_HI.Utils;
 
 package body PolyORB_HI.Unprotected_Queue is
 
-   use type PolyORB_HI.Streams.Stream_Element_Offset;
    use PolyORB_HI.Port_Kinds;
-   use Ada.Real_Time;
-   use PolyORB_HI_Generated.Deployment;
    use PolyORB_HI.Output;
-   use PolyORB_HI.Utils;
 
    ----------------
    -- Read_Event --

src/polyorb_hi-unprotected_queue.ads

@@ -35,8 +35,6 @@ With System;
 
 with PolyORB_HI_Generated.Deployment;
 
-with PolyORB_HI.Errors;
-with PolyORB_HI.Messages;
 with PolyORB_HI.Port_Kinds;
 with PolyORB_HI.Streams;
 
@@ -56,9 +54,6 @@ generic
     PolyORB_HI_Generated.Deployment.Port_Sized_String;
    --  An array type to specify the image of each port.
 
-   type Address_Array is array (Port_Type) of System.Address;
-   --  An array to specify a list of arrays of various sizes.
-
    type Overflow_Protocol_Array is array (Port_Type) of
      Port_Kinds.Overflow_Handling_Protocol;
    --  An array to specify the overflow_handling_protocol of each port
@@ -114,28 +109,6 @@ generic
    --  deducing it from Thread_Fifo_Sizes is done to guarantee static
    --  allocation of the global message queue of the thread.
 
-<<<<<<< HEAD
-=======
-   N_Destinations : in Integer_Array;
-   --  For each OUT port, we give the number of destinations. This
-   --  will be used to know the length of each element of the array
-   --  below.
-
-   Destinations : in Address_Array;
-   --  For each OUT port, we give the address of an constant
-   --  Entity_Type array containing the list of all the destination of
-   --  the port. For IN ports, we give Null_Address.
-
-   with procedure Marshall
-     (R :        Thread_Interface_Type;
-      M : in out PolyORB_Hi.Messages.Message_Type);
-   --  A procedure that marshalls a Thread port content into a message.
-
-   with function Next_Deadline return Ada.Real_Time.Time;
-   --  To indicate when does the next deadline of the thread occur (in
-   --  absolute time).
-
->>>>>>>         * Move Unprotected_Queue to a dedicated package
 package PolyORB_HI.Unprotected_Queue is
 
    use Ada.Real_Time;