     name: 'EDF'
     slug: 'edf'
     description: 'konnector description edf'
-<<<<<<< HEAD
     vendorLink: 'https://particulier.edf.fr/fr'
     category: 'energy',
-=======
-    vendorLink: 'https://particulier.edf.fr'
-
->>>>>>> ebe8132... EDF konnector: Fix error with nom mensualities accounts. (#617)
     fields:
         email:
             type: "text"

async = require 'async'
moment = require 'moment'
cozydb = require 'cozydb'
localization = require '../lib/localization_manager'


localization = require '../lib/localization_manager'

fetcher = require '../lib/fetcher'

        'consumption'
    ]

    # TODO : get one edeliaClientId: 'text'

    models: [
