From 345b4344f3f0d288b2dbb2cc71955ea40af09e1a Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Fri, 31 Jan 2020 13:57:36 -0500
Subject: [PATCH] simplify abp packages

---
 .../src/main/java/bubble/rule/bblock/BubbleBlock.java     | 8 ++++----
 utils/abp-parser                                          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bubble-server/src/main/java/bubble/rule/bblock/BubbleBlock.java b/bubble-server/src/main/java/bubble/rule/bblock/BubbleBlock.java
index 3ba4eae7..df64dc53 100644
--- a/bubble-server/src/main/java/bubble/rule/bblock/BubbleBlock.java
+++ b/bubble-server/src/main/java/bubble/rule/bblock/BubbleBlock.java
@@ -1,9 +1,9 @@
 package bubble.rule.bblock;
 
-import bubble.abp.spec.BlockDecision;
-import bubble.abp.spec.BlockList;
-import bubble.abp.spec.BlockListSource;
-import bubble.abp.spec.BlockSpec;
+import bubble.abp.BlockDecision;
+import bubble.abp.BlockList;
+import bubble.abp.BlockListSource;
+import bubble.abp.BlockSpec;
 import bubble.model.account.Account;
 import bubble.model.app.AppMatcher;
 import bubble.model.app.AppRule;
diff --git a/utils/abp-parser b/utils/abp-parser
index 76b5b8b2..2528e6ba 160000
--- a/utils/abp-parser
+++ b/utils/abp-parser
@@ -1 +1 @@
-Subproject commit 76b5b8b26a95cb1c66512af83b4c9b585544afeb
+Subproject commit 2528e6ba5c69420515c08662899e123ea9334166