summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/bitbake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index c754dab273..cdca2b6383 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -264,7 +264,7 @@ EXTRA_OEMAKE = "-e MAKEFLAGS="
# Patch handling.
##################################################################
PATCHTOOL = 'quilt'
-PATCHRESOLVE = 'user'
+PATCHRESOLVE = 'noop'
##################################################################
# Build flags and options.