s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove leftover merge conflicts

Browse Source
This commit is contained in:
Antonin Delpeuch 2018-11-22 19:16:09 +00:00
parent f667a78657
commit a4117b470c
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/tests/server/src/com/google/refine/tests/exporters/CsvExporterTests.java
View File

@ -230,13 +230,8 @@ public class CsvExporterTests extends RefineTest {
Assert.fail(); Assert.fail();
} }
<<<<<<< HEAD
String expectedOutput = ParsingUtilities.instantToLocalDateTimeString(calendar.toInstant()) + "," + String expectedOutput = ParsingUtilities.instantToLocalDateTimeString(calendar.toInstant()) + "," +
ParsingUtilities.instantToLocalDateTimeString(date.toInstant()) + "\n"; ParsingUtilities.instantToLocalDateTimeString(date.toInstant()) + "\n";
=======
String expectedOutput = ParsingUtilities.localDateToString(localDate) + "," +
ParsingUtilities.dateToString(date) + "\n";
>>>>>>> parent of c4b0ff6be... data package metadata (#1398)
Assert.assertEquals(writer.toString(), expectedOutput); Assert.assertEquals(writer.toString(), expectedOutput);
} }

1
main/webapp/modules/core/scripts/index/open-project-ui.js
View File

@ -261,7 +261,6 @@ Refine.OpenProjectUI.prototype._renderProjects = function(data) {
.attr("href", "project?project=" + project.id) .attr("href", "project?project=" + project.id)
.appendTo($(tr.insertCell(tr.cells.length))); .appendTo($(tr.insertCell(tr.cells.length)));
var tagsCell = $(tr.insertCell(tr.cells.length)); var tagsCell = $(tr.insertCell(tr.cells.length));
var tags = project.tags; var tags = project.tags;
tags.map(function(tag){ tags.map(function(tag){