NihalJain commented on code in PR #5607:
URL: https://github.com/apache/hbase/pull/5607#discussion_r1716715711
##########
pom.xml:
##########
@@ -857,8 +857,8 @@
<jaxb-api.version>2.3.1</jaxb-api.version>
<servlet.api.version>3.1.0</servlet.api.version>
<wx.rs.api.version>2.1.1</wx.rs.api.version>
- <glassfish.jsp.version>2.3.2</glassfish.jsp.version>
- <glassfish.el.version>3.0.1-b08</glassfish.el.version>
+ <tomcat.jasper.version>8.5.99</tomcat.jasper.version>
Review Comment:
Ah you are right. Tried git ui first time to resolve and messed up. Thanks
for noticing. Let me resolve conflict from git terminal.
##########
pom.xml:
##########
@@ -857,8 +857,8 @@
<jaxb-api.version>2.3.1</jaxb-api.version>
<servlet.api.version>3.1.0</servlet.api.version>
<wx.rs.api.version>2.1.1</wx.rs.api.version>
- <glassfish.jsp.version>2.3.2</glassfish.jsp.version>
- <glassfish.el.version>3.0.1-b08</glassfish.el.version>
+ <tomcat.jasper.version>8.5.99</tomcat.jasper.version>
Review Comment:
Ah you are right. Tried git ui first time to resolve and messed up. Thanks
for noticing. Let me resolve conflict from git terminal.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
