message: changed a newline
diff: @@ -25,8 +25,12 @@ __all__ = [
  unpack_location,
  apply_calibration]
  +<<<<<<< HEAD
  def load(robot, container_name, slot, label=None, share=False):
  +=======
  +def load(robot, container_name, slot, label=None):
  +>>>>>>> changed a newline
  """
  Examples
  --------
  @@ -40,11 +44,9 @@ def load(robot, container_name, slot, label=None, share=False):
  """
  return robot.add_container(container_name, slot, label)
  -
  def list():
  return container_file_loading.list_container_names()
  -
  def create(name, grid, spacing, diameter, depth, volume=0):
  columns, rows = grid
  col_spacing, row_spacing = spacing
  @@ -90,7 +92,6 @@ def container_to_json(c, name):
  ))
  return {name: {'origin-offset': container_offset,'locations': OrderedDict(locations)}}
  -
  def save_custom_container(data):
  container_file_path = environment.get_path('CONTAINERS_FILE')
  if not os.path.isfile(container_file_path):
  