adjust to allow clean merge - attempt 1

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java
index b0fc8fe913d9bd276ab334f2f8175f4b628ff7a2..e43aea87c3ca593f650fa22a34365a62477c9166 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java
@@ -57,7 +57,7 @@ import org.aspectj.weaver.patterns.TypePatternList;
  */
 public class AsmElementFormatter {
 
-  public void genLabelAndKind(MethodDeclaration methodDeclaration, IProgramElement node) {
+      public void genLabelAndKind(MethodDeclaration methodDeclaration, IProgramElement node) {
 
                if (methodDeclaration instanceof AdviceDeclaration) {
                        AdviceDeclaration ad = (AdviceDeclaration) methodDeclaration;