anchor.diff:  									label(for="commission") Commision - %
   									input(value="10" id="commission" name="group1" type="text" class="validate")
   
  -<<<<<<< HEAD
  +
   								div(class="col s3")
   									input-field
   										label(for="fee") Fee - €
   										input(placeholder="Fee" value="10" name="fee" type="text" class="validate")
   							.row
   								button(class="btn waves-effect waves-light blue-grey darken-4" type="submit" value="add") Add
  -=======
  -					div(class="col s3")
  -						label(for="commission") Commission
  -						input(value="10%" id="commission" name="group1" type="text" class="validate")
  -
  -					div(class="col s3")
  -						input-field
  -							label(for="fee") Fee
  -							input(placeholder="Fee" name="fee" type="text" class="validate")
  -				.row
  -					button(class="btn waves-effect waves-light blue-grey darken-4" type="submit" value="add") Add
  ->>>>>>> refs/remotes/origin/master
  
positive.code: 						td=consignor.firstname
  						td=consignor.lastname
  						td=consignor.city
  >>>>>>> refs/remotes/origin/master
  
  		div(class="blue-grey darken-2 col s6" style="height:100vh")
  			ul(class="collapsible" data-collapsible="accordion")
  
negative.code: 
  	.row
  		
  
  
  
  		div(class="blue-grey darken-3 col s6" style="height:100vh")
  			table(class="bordered white")
  				tr
  