aboutsummaryrefslogtreecommitdiff
path: root/licenses/LICENSE-scala.txt
diff options
context:
space:
mode:
authorAndrew Or <andrew@databricks.com>2016-05-10 11:46:02 -0700
committerAndrew Or <andrew@databricks.com>2016-05-10 11:46:02 -0700
commitcddb9da074b3dfeef34b7fdb8d9a8b16513a819d (patch)
treeff91ca0ebd54c02fe9f5d5bd8b89fef8fa52044a /licenses/LICENSE-scala.txt
parent5c6b0855787c080d3e233eb09c05c025395e7cb3 (diff)
downloadspark-cddb9da074b3dfeef34b7fdb8d9a8b16513a819d.tar.gz
spark-cddb9da074b3dfeef34b7fdb8d9a8b16513a819d.tar.bz2
spark-cddb9da074b3dfeef34b7fdb8d9a8b16513a819d.zip
[HOTFIX] SQL test compilation error from merge conflict
Diffstat (limited to 'licenses/LICENSE-scala.txt')
0 files changed, 0 insertions, 0 deletions