What is the difference between Darwin and Lamarck's view of evolution?

Darwin believed in evolution through natural selection; organisms that were the most well adapted to their environment would pass on their genes to their offspring (which the organism would have inherited at conception).

Lamarck on the other hand believed that organisms passed on traits that they had acquired during their lifespan to their offspring.

We know now that Darwin was correct, and that Lamarck was wrong.