Conflicts not resolved in file

neoanalysis / NeoAnalysis

MIT License

25 stars 6 forks source link

Closed 0x3k closed 3 years ago

0x3k commented 6 years ago

can you please fix the conflicts in NeoAnalysis/NeoAnalysis_Py3.5/NeoAnalysis/neo/io/nwbio_BACKUP_4246.py? I get:

    <<<<<<< HEAD
     ^
SyntaxError: invalid syntax

on installation.