From a4cfd0d037e3209590ad6c62f00874e6113a4168 Mon Sep 17 00:00:00 2001 From: John Furrow Date: Mon, 16 Oct 2017 22:05:55 -0700 Subject: [PATCH] Fix rebase mistakes --- client/{ => src}/javascript/components/general/WindowTitle.js | 0 client/{ => src}/javascript/util/size.js | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename client/{ => src}/javascript/components/general/WindowTitle.js (100%) rename client/{ => src}/javascript/util/size.js (100%) diff --git a/client/javascript/components/general/WindowTitle.js b/client/src/javascript/components/general/WindowTitle.js similarity index 100% rename from client/javascript/components/general/WindowTitle.js rename to client/src/javascript/components/general/WindowTitle.js diff --git a/client/javascript/util/size.js b/client/src/javascript/util/size.js similarity index 100% rename from client/javascript/util/size.js rename to client/src/javascript/util/size.js