fixed merge conflicts

This commit is contained in:
bill bittner 2017-08-04 11:58:31 -07:00
commit c95cb03fa8
2 changed files with 2 additions and 8 deletions

View file

@ -1,5 +1,5 @@
const logger = require('winston');
const licenses = ['Creative Commons', 'Public Domain', 'CC Attribution-NonCommercial 4.0 International'];
const licenses = ['Creative Commons', 'Public Domain', 'Creative Commons Attribution 4.0 International', 'Creative Commons Attribution-ShareAlike 4.0 International', 'Creative Commons Attribution-NoDerivatives 4.0 International', 'Creative Commons Attribution-NonCommercial 4.0 International', 'Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International', 'Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International'];
module.exports = ({ value }) => {
if ((licenses.includes(value.stream.metadata.license)) && (!value.stream.metadata.fee || value.stream.metadata.fee.amount === 0)) {

View file

@ -20,12 +20,6 @@
<select type="text" id="publish-license" name="license" value="license">
<option value="Public Domain">Public Domain</option>
<option value="Creative Commons">Creative Commons</option>
<option value=""></option>
<option value=""></option>
<option value=""></option>
<option value=""></option>
<option value=""></option>
<option value=""></option>
</select>
<br />
<input type="checkbox" id="publish-nsfw">
@ -63,4 +57,4 @@
// remove nsfw check
document.getElementById('publish-nsfw').checked = false;
}
</script>
</script>