Attempt to fix conflicts
As some commits from yesterday and this morning caused conflicts with commits I made last week I'm trying to fix it on the branch that I believe introduced the changes. If this does not work I do not know what I'll do but it have to be done another time.
This commit is contained in:
1 parent
aac3522e25
commit
0e9136f9fb
27 files changed
+363
-316
No files matched your search
+15
-8
@@ -1,4 +1,4 @@
|
||||
Best Utility:
|
||||
# Best Utility:
|
||||
|
||||
Anthony C Howe
|
||||
Mortice Kern Systems Inc.
|
||||
@@ -7,14 +7,21 @@ Best Utility:
|
||||
N2J 3G4
|
||||
Canada
|
||||
|
||||
## To build:
|
||||
|
||||
Judges' comments:
|
||||
|
||||
To use:
|
||||
make all
|
||||
|
||||
|
||||
### To run
|
||||
|
||||
|
||||
make am
|
||||
./am ant.test.mk
|
||||
|
||||
|
||||
|
||||
## Judges' comments
|
||||
|
||||
|
||||
Like much of Posix, obfuscation has its place. Your task is to
|
||||
figure out where.
|
||||
|
||||
@@ -23,12 +30,12 @@ Judges' comments:
|
||||
P1003 sub-committee.
|
||||
|
||||
We also suggest that you try:
|
||||
|
||||
make am
|
||||
./am Makefile am_clobber <-- clobber everything except am
|
||||
./am Makefile am_clobber # clobber everything except am
|
||||
./am Makefile all
|
||||
|
||||
|
||||
Selected notes from the author:
|
||||
## Author's comments
|
||||
|
||||
See the file ant.README.
|
||||
|
||||
|
||||
Reference in new issue
Block a user