From 5612ebef02bbedf2647d5965121e4918a21de1ce Mon Sep 17 00:00:00 2001
From: Sam Tobin-Hochstadt <samth@cs.indiana.edu>
Date: Wed, 26 Nov 2014 10:17:20 -0500
Subject: [PATCH] Fix merge error.

---
 pkgs/plt-services/meta/drdr/pkgs.rktd | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/plt-services/meta/drdr/pkgs.rktd b/pkgs/plt-services/meta/drdr/pkgs.rktd
index faec618bb9..7352cbe302 100644
--- a/pkgs/plt-services/meta/drdr/pkgs.rktd
+++ b/pkgs/plt-services/meta/drdr/pkgs.rktd
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
-()
-=======
 (("planet2-example" "https://github.com/jeapostrophe/planet2-example/")
  #;("games" "git://github.com/racket/games/"))
->>>>>>> Install, build, and test specified pkgs in DrDr.