Projects >> floodlight >>ede87d14a92a3b4e991c842b8c2fb796ee023c76

Chunk
Conflicting content
     * @param switch2 the DPID of the second switch
     * @return true if the switches are in the same cluster
     */
<<<<<<< HEAD
    public boolean inSameCluster(Long switch1, Long switch2);
    
=======
    public boolean inSameCluster(long switch1, long switch2);


>>>>>>> a6e7b7960cdd8d5051413e8fa38138e98c9a044f
    public void addListener(ITopologyListener listener);

    public boolean isIncomingBroadcastAllowedOnSwitchPort(long sw, short portId);
Solution content
     * @param switch2 the DPID of the second switch
     * @return true if the switches are in the same cluster
     */
    public boolean inSameCluster(Long switch1, Long switch2);

    public void addListener(ITopologyListener listener);

    public boolean isIncomingBroadcastAllowedOnSwitchPort(long sw, short portId);
File
ITopologyService.java
Developer's decision
Version 1
Kind of conflict
Method interface