diff options
Diffstat (limited to 'm4/Makefile.am')
| -rw-r--r-- | m4/Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/m4/Makefile.am b/m4/Makefile.am index 0d628973..7a043897 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -1 +1,5 @@ +<<<<<<< HEAD:m4/Makefile.am EXTRA_DIST= ChangeLog Makefile.am README.txt +======= +EXTRA_DIST=Makefile.am README.txt +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:m4/Makefile.am |