| Chunk |
|---|
| Conflicting content |
|---|
* Adds a stylesheet link tag with a correct resource URL in the HTML head
* tag if it isn't already present in the response.
*
<<<<<<< HEAD
* @param response the current response
* @param context the current context
=======
* @param context context of the transaction
* @param response the current response
* @param framework name of the framework that contains the file
* @param fileName CSS file name
>>>>>>> 58ab3320f8252f8f6cd89c19b2d4452d70464dd9
*/
protected void addStylesheetResourceInHead(WOContext context, WOResponse response, String framework, String fileName) {
AjaxUtils.addStylesheetResourceInHead(context, response, framework, fileName); |
| Solution content |
|---|
* Adds a stylesheet link tag with a correct resource URL in the HTML head
* tag if it isn't already present in the response.
*
* @param context context of the transaction
* @param response the current response
* @param framework name of the framework that contains the file
* @param fileName CSS file name
*/
protected void addStylesheetResourceInHead(WOContext context, WOResponse response, String framework, String fileName) {
AjaxUtils.addStylesheetResourceInHead(context, response, framework, fileName); |
| File |
|---|
| AjaxDynamicElement.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |