Stb v1.1 - Githubissues

eRose-DatabaseCleaning / STB

0 stars 1 forks source link

Stb v1.1 #10

Open laurenzzo opened 7 years ago

laurenzzo commented 7 years ago

some files translation
added all names + description
added 15k lines in craft (List_product) and tested on server/client : OK it works !

hdelanno commented 7 years ago

Great! For the conflict we will have to discuss irl how to do. Will have a look this week.

But basically, this means that there are differences in the same file between new commits in master and this PR. So you will have to check by hand... or ideally update your branch to master first.

In short, we'll do it with the comment line :)