2nd commit
Change-Id: Ib36a72cbf8e40ed7ab71b4195b9aeb7c3a2d66e1

Change-Id: Ib0a28a3c79c58fe469689e1482e627fdc013360e

rebase_testing_v4.model.lkml

diff --git a/rebase_testing_v4.model.lkml b/rebase_testing_v4.model.lkml
index 3b52c8f..fa0a720 100644
--- a/rebase_testing_v4.model.lkml
+++ b/rebase_testing_v4.model.lkml
@@ -17,5 +17,3 @@
 ### submitting something to create merge conflict
 ### submitting something to create merge conflict
 ### submitting something to create merge conflict
-
-### commit-something-for-testing-non-conflicted-commit