Resolve merge conflict with master

anushadatta · Jul 15, 2020 · 736ea6c · 736ea6c
2 parents 3866b2c + 395813c
commit 736ea6c
Show file tree

Hide file tree

Showing 30 changed files with 4 additions and 1,094 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+# ignore build artifacts in target/ directory
+target/
+# ignore IDE config file
+.idea/
diff --git a/target/FeedOn-1.0-SNAPSHOT.war b/target/FeedOn-1.0-SNAPSHOT.war
diff --git a/target/FeedOn-1.0-SNAPSHOT/WEB-INF/appengine-generated/datastore-indexes-auto.xml b/target/FeedOn-1.0-SNAPSHOT/WEB-INF/appengine-generated/datastore-indexes-auto.xml
diff --git a/target/FeedOn-1.0-SNAPSHOT/WEB-INF/appengine-generated/local_db.bin b/target/FeedOn-1.0-SNAPSHOT/WEB-INF/appengine-generated/local_db.bin
diff --git a/target/FeedOn-1.0-SNAPSHOT/WEB-INF/appengine-web.xml b/target/FeedOn-1.0-SNAPSHOT/WEB-INF/appengine-web.xml
diff --git a/target/FeedOn-1.0-SNAPSHOT/WEB-INF/classes/com/googlesps/data/Donation.class b/target/FeedOn-1.0-SNAPSHOT/WEB-INF/classes/com/googlesps/data/Donation.class
diff --git a/....0-SNAPSHOT/WEB-INF/classes/com/googlesps/feedon/servlets/BlobstoreUploadURLServlet.class b/....0-SNAPSHOT/WEB-INF/classes/com/googlesps/feedon/servlets/BlobstoreUploadURLServlet.class
diff --git a/...dOn-1.0-SNAPSHOT/WEB-INF/classes/com/googlesps/feedon/servlets/DonationOfferServlet.class b/...dOn-1.0-SNAPSHOT/WEB-INF/classes/com/googlesps/feedon/servlets/DonationOfferServlet.class
diff --git a/target/FeedOn-1.0-SNAPSHOT/WEB-INF/lib/appengine-api-1.0-sdk-1.9.59.jar b/target/FeedOn-1.0-SNAPSHOT/WEB-INF/lib/appengine-api-1.0-sdk-1.9.59.jar
diff --git a/target/FeedOn-1.0-SNAPSHOT/WEB-INF/lib/gson-2.8.6.jar b/target/FeedOn-1.0-SNAPSHOT/WEB-INF/lib/gson-2.8.6.jar
diff --git a/target/FeedOn-1.0-SNAPSHOT/WEB-INF/lib/jsr305-3.0.2.jar b/target/FeedOn-1.0-SNAPSHOT/WEB-INF/lib/jsr305-3.0.2.jar
diff --git a/target/FeedOn-1.0-SNAPSHOT/assets/AsparagusBackground.jpg b/target/FeedOn-1.0-SNAPSHOT/assets/AsparagusBackground.jpg
diff --git a/target/FeedOn-1.0-SNAPSHOT/assets/FeedOn.png b/target/FeedOn-1.0-SNAPSHOT/assets/FeedOn.png
diff --git a/target/FeedOn-1.0-SNAPSHOT/assets/logo.png b/target/FeedOn-1.0-SNAPSHOT/assets/logo.png
diff --git a/target/FeedOn-1.0-SNAPSHOT/client.js b/target/FeedOn-1.0-SNAPSHOT/client.js
diff --git a/target/FeedOn-1.0-SNAPSHOT/donation.html b/target/FeedOn-1.0-SNAPSHOT/donation.html
diff --git a/target/FeedOn-1.0-SNAPSHOT/inbox.html b/target/FeedOn-1.0-SNAPSHOT/inbox.html