Commit 2759a318 authored by Chaillet Maxime's avatar Chaillet Maxime

Fix merge conflicts. run grunt dev and grunt.

parents 9804b28b e695453e
This diff is collapsed.
...@@ -104,4 +104,4 @@ JsonExtractor.prototype.getResourceType = function (data) { ...@@ -104,4 +104,4 @@ JsonExtractor.prototype.getResourceType = function (data) {
} }
} }
return null; return null;
}; };
\ No newline at end of file
...@@ -11,9 +11,9 @@ function proposalBeamLineTable(chunk, context, bodies, params) { ...@@ -11,9 +11,9 @@ function proposalBeamLineTable(chunk, context, bodies, params) {
chunk.write('</thead>'); chunk.write('</thead>');
chunk.write('<tbody>'); chunk.write('<tbody>');
for (let index = 0; index < proposals.length; index++) { for (var index = 0; index < proposals.length; index++) {
const proposal = proposals[index]; var proposal = proposals[index];
const beamline = beamlines[index]; var beamline = beamlines[index];
chunk.write('<tr>'); chunk.write('<tr>');
chunk.write('<td>' + proposals[index] + '</td>'); chunk.write('<td>' + proposals[index] + '</td>');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment