Projects >> eurekastreams >>b741c654af0d91c1e39c2c1c2e34265fed8b4110

Chunk
Conflicting content 
     */
    @NotStrict
    @Source("style/core.css")
<<<<<<< HEAD:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/StaticResourceBundle.java
    CoreCss coreCss();
     
=======
    CssResource coreCss();

>>>>>>> 1f05c4da744f9ddc0a3247fe3db8f5075fa0e531:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/ResourceBundle.java
    /**
     * YUI CSS.
     *
Solution content 
     */
    @NotStrict
    @Source("style/core.css")
    CoreCss coreCss();
     
    /**
     * YUI CSS.
File
StaticResourceBundle.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
=======
     */
    @NotStrict
    
    /**
     * @return image.
    @Source("style/ie.css")
    CssResource ieCss();
    CssResource yuiCss();

    /**
<<<<<<< HEAD:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/StaticResourceBundle.java
     * @return image.
     */
    @Source("style/images/navLogo.png")
    ImageResource navLogo();
    
    /**
     * @return image.
     */
    @Source("style/images/navStartPage.png")
    ImageResource navStartPage();
     * IE CSS.
     * 
     * @return ie.css.

    /**
     * get image.
     * 
     * @return ImageResource
     */
    @Source("style/images/navLogo.png")
    ImageResource navLogo();

    /**
     * get image.
     * 
     * @return ImageResource
     */
    @Source("style/images/navStartPage.png")
    ImageResource navStartPage();

    /**
     * get image.
     * 
     * @return ImageResource
>>>>>>> 1f05c4da744f9ddc0a3247fe3db8f5075fa0e531:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/ResourceBundle.java
     */
    @Source("style/images/navActivity.png")
    ImageResource navActivity();
Solution content 
     */
    CssResource yuiCss();
    
    /**
     * @return image.
     */
    @Source("style/images/navLogo.png")
    ImageResource navLogo();
    
    /**
     * @return image.
     */
    @Source("style/images/navStartPage.png")
    ImageResource navStartPage();
    
    /**
     * @return image.
    @Source("style/images/navActivity.png")
    ImageResource navActivity();
File
StaticResourceBundle.java
Developer's decision
Version 1
Kind of conflict
Comment
Method interface
Chunk
Conflicting content 
    ImageResource navActivity();

    /**
<<<<<<< HEAD:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/StaticResourceBundle.java
     * @return image.
=======
     * get image.
     * 
     * @return ImageResource
>>>>>>> 1f05c4da744f9ddc0a3247fe3db8f5075fa0e531:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/ResourceBundle.java
     */
    @Source("style/images/navProfiles.png")
    ImageResource navProfiles();
Solution content 
    ImageResource navActivity();

    /**
     * @return image.
     */
    @Source("style/images/navProfiles.png")
    ImageResource navProfiles();
File
StaticResourceBundle.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
    ImageResource navProfiles();

    /**
<<<<<<< HEAD:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/StaticResourceBundle.java
     * @return image.
=======
     * get image.
     * 
     * @return ImageResource
>>>>>>> 1f05c4da744f9ddc0a3247fe3db8f5075fa0e531:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/ResourceBundle.java
     */
    @Source("style/images/navMyProfile.png")
    ImageResource navMyProfile();
Solution content 
    ImageResource navProfiles();

    /**
     * @return image.
     */
    @Source("style/images/navMyProfile.png")
    ImageResource navMyProfile();
File
StaticResourceBundle.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
    ImageResource navMyProfile();

    /**
<<<<<<< HEAD:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/StaticResourceBundle.java
     * @return image.
=======
     * get image.
     * 
     * @return ImageResource
>>>>>>> 1f05c4da744f9ddc0a3247fe3db8f5075fa0e531:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/ResourceBundle.java
     */
    @Source("style/images/navSettings.png")
    ImageResource navSettings();
Solution content 
    ImageResource navMyProfile();

    /**
     * @return image.
     */
    @Source("style/images/navSettings.png")
    ImageResource navSettings();
File
StaticResourceBundle.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
    ImageResource navSettings();

    /**
<<<<<<< HEAD:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/StaticResourceBundle.java
     * @return image.
=======
     * get image.
     * 
     * @return ImageResource
>>>>>>> 1f05c4da744f9ddc0a3247fe3db8f5075fa0e531:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/ResourceBundle.java
     */
    @Source("style/images/navHelp.png")
    ImageResource navHelp();
Solution content 
    ImageResource navSettings();

    /**
     * @return image.
     */
    @Source("style/images/navHelp.png")
    ImageResource navHelp();
File
StaticResourceBundle.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
    ImageResource navHelp();

    /**
<<<<<<< HEAD:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/StaticResourceBundle.java
     * @return image.
=======
     * get image.
     * 
     * @return ImageResource
>>>>>>> 1f05c4da744f9ddc0a3247fe3db8f5075fa0e531:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/ResourceBundle.java
     */
    @Source("style/images/red-error-icon-sm.png")
    ImageResource redErrorIconSmall();
Solution content 
    ImageResource navHelp();

    /**
     * @return image.
     */
    @Source("style/images/red-error-icon-sm.png")
    ImageResource redErrorIconSmall();
File
StaticResourceBundle.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
    ImageResource redErrorIconSmall();

    /**
<<<<<<< HEAD:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/StaticResourceBundle.java
     * @return image.
=======
     * get image.
     * 
     * @return ImageResource
     */

    /**
     * get image.
     * 
     * @return ImageResource
>>>>>>> 1f05c4da744f9ddc0a3247fe3db8f5075fa0e531:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/ResourceBundle.java
     */
    @Source("style/images/information-circle-icon.png")
    ImageResource informationCircleIcon();
Solution content 
    ImageResource redErrorIconSmall();

    /**
     * @return image.
     */
    @Source("style/images/information-circle-icon.png")
    ImageResource informationCircleIcon();
File
StaticResourceBundle.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
    ImageResource informationCircleIcon();

    /**
<<<<<<< HEAD:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/StaticResourceBundle.java
     * @return image.
     */
    @Source("style/images/global-nav-bar-5px.png")
    ImageResource globalNavBar5px();
    
    /**
     * @return image.
     */
    @Source("style/images/footerTermsOfService.png")
    ImageResource footerTermsOfService();
    
    /**
     * @return image.
     */
    @Source("style/images/poweredByEurekaStreams.png")
    ImageResource poweredByEurekaStreams();
    
    /**
     * @return image.
=======
     * get image.
     * 
     * @return ImageResource
     */
    @Source("style/images/global-nav-bar-5px.png")
    ImageResource globalNavBar5px();

    /**
     * get image.
     * 
     * @return ImageResource
     */
    @Source("style/images/footerTermsOfService.png")
    ImageResource footerTermsOfService();

    /**
     * get image.
     * 
     * @return ImageResource
     */
    @Source("style/images/poweredByEurekaStreams.png")
    ImageResource poweredByEurekaStreams();

    /**
     * get image.
     * 
     * @return ImageResource
>>>>>>> 1f05c4da744f9ddc0a3247fe3db8f5075fa0e531:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/ResourceBundle.java
     */
    @Source("style/images/footerBackground.png")
    @ImageOptions(repeatStyle=RepeatStyle.Horizontal)
Solution content 
    ImageResource informationCircleIcon();

    /**
     * @return image.
     */
    @Source("style/images/global-nav-bar-5px.png")
    ImageResource globalNavBar5px();
    
    /**
     * @return image.
     */
    @Source("style/images/footerTermsOfService.png")
    ImageResource footerTermsOfService();
    
    /**
     * @return image.
     */
    @Source("style/images/poweredByEurekaStreams.png")
    ImageResource poweredByEurekaStreams();
    
    /**
     * @return image.
     */
    @Source("style/images/footerBackground.png")
    @ImageOptions(repeatStyle=RepeatStyle.Horizontal)
File
StaticResourceBundle.java
Developer's decision
Version 1
Kind of conflict
Comment
Method interface
Chunk
Conflicting content 
    @Source("style/images/footerBackground.png")
    @ImageOptions(repeatStyle=RepeatStyle.Horizontal)
    ImageResource footerBackground();
<<<<<<< HEAD:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/StaticResourceBundle.java
    
    /**
     * @return image.
     */
    @Source("style/images/globalNavSearchBtn.png")
    ImageResource globalNavSearchBtn();
    
    /**
     * @return image.
=======

    /**
     * get image.
     * 
     * @return ImageResource
     */
    @Source("style/images/globalNavSearchBtn.png")
    ImageResource globalNavSearchBtn();

    /**
     * get image.
     * 
     * @return ImageResource
>>>>>>> 1f05c4da744f9ddc0a3247fe3db8f5075fa0e531:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/ResourceBundle.java
     */
    @Source("style/images/navBg.png")
    @ImageOptions(repeatStyle = RepeatStyle.Horizontal)
Solution content 
    @Source("style/images/footerBackground.png")
    @ImageOptions(repeatStyle=RepeatStyle.Horizontal)
    ImageResource footerBackground();
    
    /**
     * @return image.
     */
    @Source("style/images/globalNavSearchBtn.png")
    ImageResource globalNavSearchBtn();
    
    /**
     * @return image.
     */
    @Source("style/images/navBg.png")
File
StaticResourceBundle.java
Developer's decision
Version 1
Kind of conflict
Comment
Method interface
Chunk
Conflicting content 
    ImageResource navBg();

    /**
<<<<<<< HEAD:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/StaticResourceBundle.java
     * @return image.
=======
     * get image.
     * 
     * @return ImageResource
>>>>>>> 1f05c4da744f9ddc0a3247fe3db8f5075fa0e531:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/ResourceBundle.java
     */
    @Source("style/images/globalnavBg.png")
    @ImageOptions(repeatStyle = RepeatStyle.Horizontal)
Solution content 
    ImageResource navBg();

    /**
     * @return image.
     */
    @Source("style/images/globalnavBg.png")
File
StaticResourceBundle.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
=======
     * get image.
    ImageResource globalNavBg();

    /**
<<<<<<< HEAD:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/StaticResourceBundle.java
     * @return image.
     * 
     * @return ImageResource
>>>>>>> 1f05c4da744f9ddc0a3247fe3db8f5075fa0e531:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/ResourceBundle.java
     */
    @Source("style/images/navNotification.png")
    ImageResource navNotification();
Solution content 
    ImageResource globalNavBg();

    /**
     * @return image.
     */
    @Source("style/images/navNotification.png")
    ImageResource navNotification();
File
StaticResourceBundle.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
    ImageResource navNotification();

    /**
<<<<<<< HEAD:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/StaticResourceBundle.java
     * @return image.
=======
     * get image.
     * 
     * @return ImageResource
>>>>>>> 1f05c4da744f9ddc0a3247fe3db8f5075fa0e531:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/ResourceBundle.java
     */
    @Source("style/images/streamHeaderOverlay.png")
    ImageResource streamHeaderOverlay();
Solution content 
    ImageResource navNotification();

    /**
     * @return image.
     */
    @Source("style/images/streamHeaderOverlay.png")
    ImageResource streamHeaderOverlay();
File
StaticResourceBundle.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
    ImageResource streamHeaderOverlay();

    /**
<<<<<<< HEAD:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/StaticResourceBundle.java
     * @return image.
     */
    @Source("style/images/createGadget.png")
    ImageResource createGadget();
    
    /**
     * @return image.
     */
    @Source("style/images/createGadgetHover.png")
    ImageResource createGadgetHover();
    
    /**
     * @return image.
     */
    @Source("style/images/activityStreamSearchBtn.png")
    ImageResource activityStreamSearchBtn(); 
    
    /**
     * @return image.
     */
    @Source("style/images/feed-icon-16x16.png")
    ImageResource feedIcon16();
    
    /**
     * @return image.
     */
    @Source("style/images/activitypageListItemOverlayInActive.png")
    ImageResource activitypageListItemOverlayInActive();
    
    /**
     * @return image.
=======
     * get image.
     * 
     * @return ImageResource
     */
    @Source("style/images/createGadget.png")
    ImageResource createGadget();

    /**
     * get image.
     * 
     * @return ImageResource
     */
    @Source("style/images/createGadgetHover.png")
    ImageResource createGadgetHover();

    /**
     * get image.
     * 
     * @return ImageResource
     */
    @Source("style/images/activityStreamSearchBtn.png")
    ImageResource activityStreamSearchBtn();

    /**
     * get image.
     * 
     * @return ImageResource
     */
    @Source("style/images/feed-icon-16x16.png")
    ImageResource feedIcon16();

    /**
     * get image.
     * 
     * @return ImageResource
     */
    @Source("style/images/activitypageListItemOverlayInActive.png")
    ImageResource activitypageListItemOverlayInActive();

    /**
     * get image.
     * 
     * @return ImageResource
>>>>>>> 1f05c4da744f9ddc0a3247fe3db8f5075fa0e531:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/ResourceBundle.java
     */
    @Source("style/images/postBtnInactive.png")
    ImageResource postBtnInactive();
Solution content 
    /**
     * @return image.
     */
    ImageResource streamHeaderOverlay();

    /**
     * @return image.
     */
    @Source("style/images/createGadget.png")
    ImageResource createGadget();
    
    /**
     * @return image.
     */
    @Source("style/images/createGadgetHover.png")
    ImageResource createGadgetHover();
    
    @Source("style/images/activityStreamSearchBtn.png")
    ImageResource activityStreamSearchBtn(); 
    
    /**
     * @return image.
     */
    @Source("style/images/feed-icon-16x16.png")
    ImageResource feedIcon16();
    
    /**
     * @return image.
     */
    @Source("style/images/activitypageListItemOverlayInActive.png")
    ImageResource activitypageListItemOverlayInActive();
    
    /**
     * @return image.
     */
    @Source("style/images/postBtnInactive.png")
    ImageResource postBtnInactive();
File
StaticResourceBundle.java
Developer's decision
Version 1
Kind of conflict
Comment
Method interface
Chunk
Conflicting content 
    ImageResource postBtnInactive();

    /**
<<<<<<< HEAD:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/StaticResourceBundle.java
     * @return image.
     */
    @Source("style/images/postBtn.png")
    ImageResource postBtn();
    
    /**
     * @return image.
=======
     * get image.
     * 
     * @return ImageResource
     */
    @Source("style/images/postBtn.png")
    ImageResource postBtn();

    /**
     * get image.
     * 
     * @return ImageResource
>>>>>>> 1f05c4da744f9ddc0a3247fe3db8f5075fa0e531:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/ResourceBundle.java
     */
    @Source("style/images/moveBtnInactive.png")
    ImageResource moveBtnInactive();
Solution content 
    ImageResource postBtnInactive();

    /**
     * @return image.
     */
    @Source("style/images/postBtn.png")
    ImageResource postBtn();
    
    /**
     * @return image.
     */
    @Source("style/images/moveBtnInactive.png")
    ImageResource moveBtnInactive();
File
StaticResourceBundle.java
Developer's decision
Version 1
Kind of conflict
Comment
Method interface
Chunk
Conflicting content 
    ImageResource moveBtnInactive();

    /**
<<<<<<< HEAD:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/StaticResourceBundle.java
     * @return image.
=======
     * get image.
     * 
     * @return ImageResource
>>>>>>> 1f05c4da744f9ddc0a3247fe3db8f5075fa0e531:web/src/main/java/org/eurekastreams/web/client/ui/pages/master/ResourceBundle.java
     */
    @Source("style/images/moveBtnActive.png")
    ImageResource moveBtnActive();
Solution content 
    ImageResource moveBtnInactive();

    /**
     * @return image.
     */
    @Source("style/images/moveBtnActive.png")
    ImageResource moveBtnActive();
File
StaticResourceBundle.java
Developer's decision
Version 1
Kind of conflict
Comment