Mercurial > hg > release > icedtea7-forest-2.1 > hotspot

changeset 2926:c1378bce4f58

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix merge issue.
author andrew
date Wed, 08 Feb 2012 21:10:09 +0000
parents 7bcec32b0c9a
children f8f4d3f9b165
files src/cpu/zero/vm/methodHandles_zero.hpp
diffstat 1 files changed, 0 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/zero/vm/methodHandles_zero.hpp	Tue Jan 10 13:32:55 2012 +0000
+++ b/src/cpu/zero/vm/methodHandles_zero.hpp	Wed Feb 08 21:10:09 2012 +0000
@@ -29,11 +29,7 @@
   adapter_code_size = 0
 };
 
-<<<<<<< local
 #define TARGET_ARCH_NYI_6939861 
-=======
-#define TARGET_ARCH_NYI_6939861 1
->>>>>>> other
 // ..#ifdef TARGET_ARCH_NYI_6939861
 // ..  // Here are some backward compatible declarations until the 6939861 ports are updated.
 // ..  #define _adapter_flyby    (_EK_LIMIT + 10)