aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/Makefile
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2015-04-02 14:53:19 +0000
committerNicolas Thill <nico@openwrt.org>2015-04-02 14:53:19 +0000
commit3bd422f61026ff49281380a8865889c2ad7b2e7b (patch)
tree1962c04330e7ca5aa836848359aaee5d4e52c507 /package/base-files/Makefile
parent1fe3836fbc598ca03fa199439c3e66d6b45f6b64 (diff)
downloadupstream-3bd422f61026ff49281380a8865889c2ad7b2e7b.tar.gz
upstream-3bd422f61026ff49281380a8865889c2ad7b2e7b.tar.bz2
upstream-3bd422f61026ff49281380a8865889c2ad7b2e7b.zip
kernel/modules: remove merge conflicts leftovers
Signed-off-by: Nicolas Thill <nico@openwrt.org> SVN-Revision: 45243
Diffstat (limited to 'package/base-files/Makefile')
0 files changed, 0 insertions, 0 deletions