- remove redundant merge conflict
authorMark Huang <mlhuang@cs.princeton.edu>
Sat, 20 Aug 2005 23:57:28 +0000 (23:57 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Sat, 20 Aug 2005 23:57:28 +0000 (23:57 +0000)
commit6a59a6a7f1a3e5c03a66ed9004113f64e80b45c8
tree9dffabcadaf9d3cc13fcedbb4414010d4868a01c
parent6c9e9809706489b3e8b0b90d336bdd30af9e7928
- remove redundant merge conflict
kernel/Makefile