From d68c6693963a468ecb62c76155aad7f479b78f78 Mon Sep 17 00:00:00 2001
From: Tariel Hlontsi <xhaaix@gmail.com>
Date: Fri, 29 Apr 2016 14:54:58 +0300
Subject: [PATCH] After merging

---
 .idea/gradle.xml                                            | 6 ++++++
 .idea/vcs.xml                                               | 2 +-
 .../main/java/hikapro/com/backpack/model/database/DAO.java  | 1 -
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8d2df47..c3bf4f7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -12,6 +12,12 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
+        <option name="myModules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 6564d52..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/hikapro/com/backpack/model/database/DAO.java b/app/src/main/java/hikapro/com/backpack/model/database/DAO.java
index 9d848be..d5eb553 100644
--- a/app/src/main/java/hikapro/com/backpack/model/database/DAO.java
+++ b/app/src/main/java/hikapro/com/backpack/model/database/DAO.java
@@ -17,7 +17,6 @@ import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;