[TASK] Removing stuff from merge conflict

Resources/Private/Templates/Joblist/ApplyForm.html

@@ -5,11 +5,7 @@
 		<f:form.hidden value="{job.uid}" property="jobId" />
 
 		<label for="apply-gender"><f:translate key="frontend.apply.gender" /></label>
-<<<<<<< HEAD
-		<f:form.select property="gender" id="apply-gender" data="{}" class="" options="{Male: 'Male', Female: 'Female'}" />
-=======
 		<f:form.select property="gender" id="apply-gender" class="" options="{None: '', Male: 'Male', Female: 'Female'}" />
->>>>>>> ef0bad6dbd9fd1503cfce001734cb83f277d8404
 		<f:form.validationResults for="applyData.gender">
 			<f:for each="{validationResults.errors}" as="error">
 				<div class="sg-jobs-validation-error">

Resources/Public/JavaScript/sgjobs.js

-module.exports = function() {
-
-	'use strict';
-
-	const $ = require('jquery');
-
-	let SgJobs = {};
-
-	SgJobs.init = function() {
-		$('body').delegate('.sgjobs-select', 'change', function() {
-			$.post(
-				'?eID=sgAjax&extensionName=SgJobs&controller=Ajax%5CJoblist&action=filter&format=html',
-				{
-					parameters: {
-						country: $('#filter-countries').val(),
-						location: $('#filter-locations').val(),
-						company: $('#filter-companies').val(),
-						area: $('#filter-areas').val(),
-						function: $('#filter-functions').val(),
-					}
-				}
-			).done(function(result) {
-				// replace filter & job list with result from ajax controller
-				$('#sgjobs-joblist').html(result);
-			});
-		});
-	};
-
-	return SgJobs;
-};