From d8401e841fc6c41987e727c080422c59ba159060 Mon Sep 17 00:00:00 2001
From: David Baldwynn <david.baldwin@alumni.ubc.ca>
Date: Thu, 9 Jul 2015 15:21:29 -0700
Subject: [PATCH] merged stashed changes

---
 public/modules/forms/directives/edit-form.client.directive.js | 3 +--
 public/modules/forms/views/view-form-submissions.view.html    | 1 +
 public/modules/users/config/users.client.config.js            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/modules/forms/directives/edit-form.client.directive.js b/public/modules/forms/directives/edit-form.client.directive.js
index 96e1c2cb..c84a0f9e 100644
--- a/public/modules/forms/directives/edit-form.client.directive.js
+++ b/public/modules/forms/directives/edit-form.client.directive.js
@@ -26,14 +26,13 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', '$q', '$ht
                 $scope.accordion = {};
                 $scope.accordion.oneAtATime = true;
 
-                // Add a new field to form
+                // Add a new field
                 $scope.addNewField = function(fieldType){
 
                     // incr field_id counter
                     $scope.addField.lastAddedID++;
                     var fieldTitle;
 
-                    //F
                     for(var i = 0; i < $scope.addField.types.length; i++){
                         // console.log($scope.addField.types[i].name === fieldType);
                         if($scope.addField.types[i].name === fieldType){
diff --git a/public/modules/forms/views/view-form-submissions.view.html b/public/modules/forms/views/view-form-submissions.view.html
index 21e88299..ccfdb743 100644
--- a/public/modules/forms/views/view-form-submissions.view.html
+++ b/public/modules/forms/views/view-form-submissions.view.html
@@ -12,6 +12,7 @@
 				</a>
 			</small>
 		</div>
+
 	</div>
 	<div class="row">
 
diff --git a/public/modules/users/config/users.client.config.js b/public/modules/users/config/users.client.config.js
index b43b2251..7a4ee7cb 100755
--- a/public/modules/users/config/users.client.config.js
+++ b/public/modules/users/config/users.client.config.js
@@ -22,4 +22,4 @@ angular.module('users').config(['$httpProvider',
         }
       };
     });
-}]);
+}]);
\ No newline at end of file