ischema
Merge branch 'master' of ssh://localhost:4444/home/bit4bit/neurotelcal
Merge branch 'master' of ssh://localhost:4444/home/bit4bit/neurotelcal
Merge branch 'master' of ssh://localhost:4444/home/bit4bit/neurotelcal-svr
Merge branch 'master' of ssh://localhost:4444/home/bit4bit/neurotelcal-svr
Merge branch 'master' of ssh://localhost:4444/home/bit4bit/neurotelcal-svr
Merge branch 'master' of ssh://localhost:4444/home/bit4bit/neurotelcal-svr
Merge branch 'master' of ssh://localhost:4444/home/bit4bit/neurotelcal-svr
Merge branch 'master' of ssh://localhost:4444/home/bit4bit/neurotelcal-svr
mezcla
Merge branch 'master' of ssh://localhost:4444/home/bit4bit/neurotelcal-svr

Conflicts:
	db/schema.rb
Merge branch 'master' of ssh://localhost:4444/home/bit4bit/neurotelcal-svr

Conflicts:
	.gitignore
Merge branch 'master' of ssh://localhost:4444/home/bit4bit/neurotelcal-svr
Merge branch 'master' of ssh://localhost:4444/home/bit4bit/neurotelcal-svr
corr
Merge branch 'master' of ssh://localhost:4444/home/bit4bit/neurotelcal-svr
corr
Merge branch 'master' of ssh://localhost:4444/home/bit4bit/neurotelcal-svr
corr
Merge branch 'master' of ssh://localhost:4444/home/bit4bit/neurotelcal-svr