From 8ea7e34a60b811e43d632ae9bd4aa6c5f88a97e6 Mon Sep 17 00:00:00 2001
From: Tian Jin <tjingrant@gmail.com>
Date: Sat, 21 Dec 2019 00:51:05 -0500
Subject: [PATCH] clean up

---
 src/compiler/dialect/krnl/krnl_ops.hpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/compiler/dialect/krnl/krnl_ops.hpp b/src/compiler/dialect/krnl/krnl_ops.hpp
index b985066..8e9ae83 100644
--- a/src/compiler/dialect/krnl/krnl_ops.hpp
+++ b/src/compiler/dialect/krnl/krnl_ops.hpp
@@ -21,7 +21,7 @@ class KrnlOpsDialect : public Dialect {
  public:
   KrnlOpsDialect(MLIRContext* context);
   static StringRef getDialectNamespace() { return "krnl"; }
-  
+
   /// Parse a type registered to this dialect.
   Type parseType(DialectAsmParser& parser) const override {
     if (succeeded(parser.parseOptionalKeyword("loop")))
@@ -38,7 +38,6 @@ class KrnlOpsDialect : public Dialect {
         return;
     }
   }
->>>>>>> 011cc1b... Update type parser (#376)
 };
 
 #define GET_OP_CLASSES