From c928dcc118aa35a3c586bd71b3ba237f337b5a7c Mon Sep 17 00:00:00 2001
From: Drew Gross <drew.a.gross@gmail.com>
Date: Sat, 21 May 2016 21:20:53 -0700
Subject: [PATCH] Prevent untransforming inner object keys named _p_*

---
 spec/ParseAPI.spec.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/ParseAPI.spec.js b/spec/ParseAPI.spec.js
index cceb818f..f8dcc058 100644
--- a/spec/ParseAPI.spec.js
+++ b/spec/ParseAPI.spec.js
@@ -1170,4 +1170,6 @@ describe('miscellaneous', function() {
       done();
     });
   });
+=======
+>>>>>>> Prevent untransforming inner object keys named _p_*
 });