From c37fb0c5ff9ab5dc4e0f26e32348341edbbf900e Mon Sep 17 00:00:00 2001
From: Peter LaFosse <peter@vector35.com>
Date: Sun, 5 Mar 2017 13:47:36 -0500
Subject: fixing failed merge

---
 binaryninjaapi.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'binaryninjaapi.h')

diff --git a/binaryninjaapi.h b/binaryninjaapi.h
index 3d7b245b..7ac790d1 100644
--- a/binaryninjaapi.h
+++ b/binaryninjaapi.h
@@ -2587,7 +2587,6 @@ namespace BinaryNinja
 	typedef BNPluginOrigin PluginOrigin;
 	typedef BNPluginUpdateStatus PluginUpdateStatus;
 	typedef BNPluginType PluginType;
-	typedef BNRepositoryManifest RepositoryManifest;
 
 	class RepoPlugin: public CoreRefCountObject<BNRepoPlugin, BNNewPluginReference, BNFreePlugin>
 	{
-- 
cgit v1.3.1