Github user jaceklaskowski commented on a diff in the pull request:
https://github.com/apache/spark/pull/12469#discussion_r60726392
--- Diff: sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveUtils.scala
---
@@ -80,10 +80,8 @@ class HiveContext private[hive](
protected[sql] override def sharedState: HiveSharedState = {
sparkSession.sharedState.asInstanceOf[HiveSharedState]
}
-
--- End diff --
It was because I touched the file (not the line) and while I was rebasing I
noticed the offending line. When I was at it I decided to remove it since I was
fixing the merge conflict.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
