Changeset 23a08aa0 for src/GenPoly/module.mk

Timestamp:

Sep 19, 2022, 8:11:02 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

aa9f215

Parents:

ebf8ca5 (diff), ae1d151 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

fix merge conflict

File:

• src/GenPoly/module.mk (modified) (1 diff)

src/GenPoly/module.mk

@@ -27 +27 @@
         GenPoly/FindFunction.cc \
         GenPoly/FindFunction.h \
+        GenPoly/InstantiateGenericNew.cpp \
         GenPoly/InstantiateGeneric.cc \
         GenPoly/InstantiateGeneric.h \