Closed KrunchMuffin closed 7 years ago
all good?
I checked what you had and I swear it said 6
On Sep 15, 2016 12:39 PM, "Oscar Arevalo" notifications@github.com wrote:
@oarevalo commented on this pull request.
In client/bugLogService.cfc https://github.com/oarevalo/BugLogHQ/pull/147#pullrequestreview-205470:
@@ -1,5 +1,5 @@
- - what happened to 6?
— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/oarevalo/BugLogHQ/pull/147#pullrequestreview-205470, or mute the thread https://github.com/notifications/unsubscribe-auth/AA_TjSJoyVvGBVIIcAGBBJXs_wS2i_U7ks5qqXTKgaJpZM4J-EAh .
nevermind, you are right; i was looking at the wrong place. 7 is right
can you solve the merge conflict? Once that is done we can merge the PR. doesn't look like the conflict is any major thing.
@KrunchMuffin never mind on the merge conflict. I took care of it.
Thanks for finding and fixing this issue!
cool. i was at lunch. thanks!
Also, please increment the value of
variables.bugLogClientVersion
at the beginning ofbugLogService.cfc
. This helps to keep track of which version is being used.