Back to the main page.
Bug 2123 - ft_checkdata and others: there are some conflicted files on /home/common/fieldtrip
| Status | CLOSED FIXED |
| Reported | 2013-04-18 17:51:00 +0200 |
| Modified | 2019-08-10 12:03:34 +0200 |
| Product: | FieldTrip |
| Component: | core |
| Version: | unspecified |
| Hardware: | PC |
| Operating System: | Mac OS |
| Importance: | P3 blocker |
| Assigned to: | |
| URL: | |
| Tags: | |
| Depends on: | 1841 |
| Blocks: | |
| See also: |
Jan-Mathijs Schoffelen - 2013-04-18 17:51:16 +0200
bash-4.1$ pwd /home/common/matlab/fieldtrip bash-4.1$ grep -l '>>>>>>>' *.m */*.m */*/*.m ft_sourceparcellate.m test/test_bug2085.m utilities/ft_checkdata.m fileio/private/ft_checkdata.m
Robert Oostenveld - 2013-04-18 17:56:51 +0200
there was indeed a short moment that the files were corrupt in svn. I fixed that. roboos@mentat002> /home/mrphys/roboos/bin/release-nijmegen.sh At revision 8055. should resolve it. I checked it afterward and home/common is ok again.