- Thread starter
- #21
will try but that's not going to be for today...
still curious though as what the mergeconflict is... I only changed the imdbmovie.cs
still curious though as what the mergeconflict is... I only changed the imdbmovie.cs
was only on 2 log lines,still curious though as what the mergeconflict is... I only changed the imdbmovie.cs
don't worry, if not today ...will try but that's not going to be for today...
oops, maybe wrong name, i mean the script. :imdb.cs? ... Hmmmm... I dont remember this file...
yes fixed, the TEST4+PR is the branchso you've fixed the mergeconflict? What is the source for it? The test4+PR?