Lamarckian vs. Mendelian genetics was about heritable traits being acquired in life (Lamarck), or being discrete units passed down at conception (Mendel).
Genetics is almost entirely Mendelian, but some of epigenetics is durable and thus Lamarckian.
There's also retroviral integrations, transposons, and all sorts of other complexities that don't fit neatly into boxes.