no bug. bad merge. updating embedding/Makefile.in
authorDoug Turner <dougt@dougt.org>
Fri, 18 Nov 2011 16:08:57 -0800
changeset 83549 782078ea0b4247007abf9203a355ae432082bc3a
parent 83548 92f5345081e951805751ef2d6ab73eb8570108d5
child 83550 40f98beecf70776b84012d5035567467738ef62e
push id519
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 00:38:35 +0000
treeherdermozilla-beta@788ea1ef610b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone11.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
no bug. bad merge. updating embedding/Makefile.in
embedding/Makefile.in
--- a/embedding/Makefile.in
+++ b/embedding/Makefile.in
@@ -48,18 +48,15 @@ MODULE       = embed
 
 DIRS = base components browser
 
 ifdef ENABLE_TESTS
 XPCSHELL_TESTS = tests/unit
 DIRS += test
 endif
 
-<<<<<<< local
-=======
 ifeq ($(MOZ_WIDGET_TOOLKIT),android)
 ifeq ($(MOZ_BUILD_APP),mobile/xul)
 DIRS += android
 endif
 endif
 
->>>>>>> other
 include $(topsrcdir)/config/rules.mk