piTrafficPlace, piSceneAuto have git merge stray text.

ISET / iset3d-v3

LEGACY: Replaced by iset3d (v4) -- Read a PBRT file. Edit the parameters. Render an ISET scene or optical image.

MIT License

36 stars 8 forks source link

piTrafficPlace, piSceneAuto have git merge stray text. #19

Closed DavidBrainard closed 5 years ago

DavidBrainard commented 5 years ago

There's some of that "<<<<< HEAD" sort of stuff in these two files. I believe it has been there for at least a little while, because a file history check indicates last change around November 9. That is, I don't think this relates to things I have done in the last few days.

Zhenyi-Liu commented 5 years ago

@DavidBrainard Hi David, the stray text has been removed, thanks for checking on this.